+++ /dev/null
--- Bookmark system for Links-Lua.
--- $Id$
-
------------------------------------------------------------------------
--- User options
----------------------------------------------------------------------
-
--- Default location to save and load bookmarks from.
-bm_bookmark_file = home_dir.."/.links/bookmark.lst"
-
--- Set to non-`nil' to see URLs in the generated page.
-bm_display_urls = nil
-
--- Set to non-`nil' to show links to category headers.
--- Only useful while sorting categories, otherwise just annoying.
-bm_display_category_links = 1
-
--- Set to non-`nil' to automatically sort bookmarks alphabetically.
--- Do not set this if you care about the sorting of your bookmarks!
-bm_auto_sort_bookmarks = nil
-
-
-----------------------------------------------------------------------
--- Implementation
-----------------------------------------------------------------------
-
--- We use a special syntax that looks like
--- user:bookmark/1 (for categories)
--- user:bookmark/1,2/http://some.phony.url/ (for bookmarks)
-bm_marker = 'user:bookmark'
-
-
-if not bm_bookmarks then
- -- If the user reloads this script, we don't want to
- -- lose all the bookmarks! :-)
- bm_bookmarks = {}
-end
-
-
-function bm_is_category (str)
- local _,n = gsub (str, bm_marker..'/%d+$', '')
- return n ~= 0
-end
-
-
-function bm_is_bookmark (str)
- local _,n = gsub (str, bm_marker..'/%d+,%d+/', '')
- return n ~= 0
-end
-
-
-function bm_decode_info (str)
- if bm_is_category (str) then
- str = gsub (str, '.-/(%d+)', 'return %1')
- else
- str = gsub (str, '.-/(%d+),(%d+)/(.*)', 'return %1,%2,"%3"')
- end
- return dostring (str)
-end
-
-
-function bm_find_category (cat)
- for i = 1, getn (bm_bookmarks) do
- local table = bm_bookmarks[i]
- if table.category == cat then return table end
- end
-end
-
-
-function bm_sort_bookmarks ()
- if not bm_auto_sort_bookmarks then return end
- sort (bm_bookmarks, function (a, b) return a.category < b.category end)
- foreachi (bm_bookmarks,
- function (i, v)
- sort (v, function (a, b) return a.name < b. name end)
- end)
-end
-
-
-function bm_generate_html ()
- local s = '<html><head><title>Bookmarks</title></head>'
- ..'<body link=blue>\n'
- for i = 1, getn (bm_bookmarks) do
- local table = bm_bookmarks[i]
- s = s..'<h3>'
- if bm_display_category_links then
- s = s..'<a href="'..bm_marker..'/'..i..'">'
- end
- s = s..'<font color=gray>'..table.category..'</font>'
- if bm_display_category_links then
- s = s..'</a>'
- end
- s = s..'</h3>\n<ul>\n'
- for j = 1, getn (table) do
- local bm = table[j]
- s = s..'<li><a href="'..bm_marker..'/'..i..','..j..'/'
- ..bm.url..'">'..bm.name..'</a>\n'
- if bm_display_urls then s = s..'<br>'..bm.url..'\n' end
- end
- s = s..'</ul>\n'
- end
- s = s..'<hr>'..date ()..'\n'
- return s..'</body></html>\n'
-end
-
-
--- Write bookmarks to disk.
-function bm_save_bookmarks (filename)
- if bm_dont_save then return end
-
- function esc (str)
- return gsub (str, "([^-%w \t_@#:/'().])",
- function (s)
- return format ("\\%03d", strbyte (s))
- end)
- end
-
- if not filename then filename = bm_bookmark_file end
- local tab = ' '
- writeto (filename)
- write ('return {\n')
- for i = 1, getn (bm_bookmarks) do
- local table = bm_bookmarks[i]
- write (tab..'{\n'..tab..tab..'category = "'
- ..esc (table.category)..'";\n')
- for i = 1, getn (table) do
- local bm = table[i]
- write (tab..tab..'{ name = "'..esc (bm.name)..'", url = "'
- ..esc (bm.url)..'" },\n')
- end
- write (tab..'},\n')
- end
- write ('}\n')
- writeto ()
-end
-
-
--- Load bookmarks from disk.
-function bm_load_bookmarks (filename)
- if not filename then filename = bm_bookmark_file end
- local tmp = dofile (filename)
- if type (tmp) == 'table' then
- bm_bookmarks = tmp
- bm_sort_bookmarks ()
- bm_dont_save = nil
- else
- _ALERT ("Error loading "..filename)
- bm_dont_save = 1
- end
-end
-
-
--- Return the URL of a bookmark.
-function bm_get_bookmark_url (bm)
- if bm_is_bookmark (bm) then
- local _,_,url = bm_decode_info (bm)
- return url
- end
-end
-
-
--- Bind this to a key to display bookmarks.
-function bm_view_bookmarks ()
- local tmp = tmpname()..'.html'
- writeto (tmp)
- write (bm_generate_html ())
- writeto ()
- tinsert (tmp_files, tmp)
- return 'goto_url', tmp
-end
-
-
-function bm_do_add_bookmark (cat, name, url)
- if cat == "" or name == "" or url == "" then
- _ALERT ("Bad bookmark entry")
- end
- local table = bm_find_category (cat)
- if not table then
- table = { category = cat }
- tinsert (bm_bookmarks, table)
- end
- tinsert (table, { name = name, url = url })
- bm_sort_bookmarks ()
-end
-
-
--- Bind this to a key to add a bookmark.
-function bm_add_bookmark ()
- edit_bookmark_dialog ('', current_title () or '', current_url () or '',
- function (cat, name, url)
- bm_do_add_bookmark (cat, name, url)
- if current_title () == 'Bookmarks' then
- return bm_view_bookmarks ()
- end
- end)
-end
-
-
--- Bind this to a key to edit the currently highlighted bookmark.
-function bm_edit_bookmark ()
- local bm = current_link ()
- if not bm then
- elseif bm_is_category (bm) then
- local i = bm_decode_info (bm)
- edit_bookmark_dialog (bm_bookmarks[i].category, '', '',
- function (cat)
- if cat == '' then
- _ALERT ('Bad input')
- elseif bm_bookmarks[%i].category ~= cat then
- local j = bm_find_category (cat)
- if not j then
- bm_bookmarks[%i].category = cat
- else
- local tmp = bm_bookmarks[%i]
- for i = 1, getn (tmp) do
- bm_do_add_bookmark (cat, tmp[i].name, tmp[i].url)
- end
- bm_delete_bookmark (%i)
- end
- return bm_view_bookmarks ()
- end
- end)
-
- elseif bm_is_bookmark (bm) then
- local i,j = bm_decode_info (bm)
- local entry = bm_bookmarks[i][j]
- edit_bookmark_dialog (bm_bookmarks[i].category,
- entry.name, entry.url,
- function (cat, name, url)
- if cat == '' or name == '' or url == '' then
- _ALERT ('Bad input')
- else
- if cat ~= bm_bookmarks[%i].category then
- bm_do_delete_bookmark (%i, %j)
- bm_do_add_bookmark (cat, name, url)
- else
- %entry.name = name
- %entry.url = url
- end
- return bm_view_bookmarks ()
- end
- end)
- end
-end
-
-
-function bm_do_delete_bookmark (i, j)
- if not j then
- tremove (bm_bookmarks, i)
- else
- tremove (bm_bookmarks[i], j)
- if getn (bm_bookmarks[i]) == 0 then tremove (bm_bookmarks, i) end
- end
-end
-
-
--- Bind this to a key to delete the currently highlighted bookmark.
-function bm_delete_bookmark ()
- local bm = current_link ()
- if bm and (bm_is_category (bm) or bm_is_bookmark (bm)) then
- local i,j = bm_decode_info (bm)
- bm_do_delete_bookmark (i, j)
- return bm_view_bookmarks ()
- end
-end
-
-
-function bm_do_move_bookmark (dir)
- function tswap (t, i, j)
- if i > 0 and j > 0 and i <= getn (t) and j <= getn (t) then
- local x = t[i]; t[i] = t[j]; t[j] = x
- return 1
- end
- end
-
- local bm = current_link ()
- if not bm then
- elseif bm_is_category (bm) then
- local i = bm_decode_info (bm)
- if tswap (bm_bookmarks, i, i+dir) then
- return bm_view_bookmarks ()
- end
- elseif bm_is_bookmark (bm) then
- local i,j = bm_decode_info (bm)
- if bm_bookmarks[i] and tswap (bm_bookmarks[i], j, j+dir) then
- return bm_view_bookmarks ()
- end
- end
-end
-
-
--- Bind this to a key to move the currently highlighted bookmark up.
-function bm_move_bookmark_up ()
- if not bm_auto_sort_bookmarks then return bm_do_move_bookmark (-1) end
-end
-
-
--- Bind this to a key to move the currently highlighted bookmark down.
-function bm_move_bookmark_down ()
- if not bm_auto_sort_bookmarks then return bm_do_move_bookmark (1) end
-end
-
-
--- vim: shiftwidth=4 softtabstop=4
+++ /dev/null
---- elinks/src/protocol/http/http.c Sun Dec 22 12:52:20 2002
-+++ elinks.2/src/protocol/http/http.c Tue Dec 24 22:15:59 2002
-@@ -665,16 +665,14 @@
- /* Number of uncompressed bytes that could be safely get from
- * read_encoded(). We can't want to read too much, because if gzread
- * "clears" the buffer next time it will return -1. */
-- int ret = 0;
-+ int ret = 2048;
- int r = 0, *length_of_block;
-- /* If true, all stuff was written to pipe and only uncompression is
-- * wanted now. */
-- int finishing = 0;
- unsigned char *output = NULL;
-
- length_of_block = (info->length == LEN_CHUNKED ? &info->chunk_remaining
- : &info->length);
-- if (!*length_of_block) finishing = 1;
-+ if (!*length_of_block)
-+ ret = 65536;
-
- if (conn->content_encoding == ENCODING_NONE) {
- *new_len = len;
-@@ -690,9 +688,9 @@
- || set_nonblocking_fd(conn->stream_pipes[1]) < 0))
- return NULL;
-
-- while (r == ret) {
-- if (!finishing) {
-- int written = write(conn->stream_pipes[1], data, len);
-+ do {
-+ if (ret == 2048) {
-+ int written = write(conn->stream_pipes[1], data, len > ret ? ret : len);
-
- /* When we're writing zero bytes already, we want to
- * zero ret properly for now, so that we'll go out for
-@@ -700,37 +698,16 @@
- * zero bytes, but ret will be on its original value,
- * causing us to close the stream, and that's disaster
- * when more data are about to come yet. */
-- if (written > 0 || (!written && !len)) {
-- ret = written;
-- data += ret;
-- len -= ret;
-+ if (written > 0) {
-+ data += written;
-+ len -= written;
- if (*length_of_block > 0)
-- *length_of_block -= ret;
-+ *length_of_block -= written;
- if (!info->length)
-- finishing = 1;
-+ ret = 65536;
-+ else if (!len)
-+ return output;
- }
--
-- if (len) {
-- /* We assume that this is because full pipe. */
-- /* FIXME: We should probably handle errors as
-- * well. --pasky */
-- ret = 4096; /* pipe capacity */
-- }
-- }
-- /* finishing could be changed above ;) */
-- if (finishing) {
-- /* Granularity of the final decompression. When we were
-- * taking the decompressed content, we only took the
-- * amount which we inserted there. When finishing, we
-- * have to drain the rest from the beast. */
-- /* TODO: We should probably double the ret before trying
-- * to read as well..? Would maybe make the progressive
-- * displaying feeling better? --pasky */
-- ret = 65536;
-- }
-- if (ret < 4096) {
-- /* Not enough data, try in next round. */
-- return output;
- }
-
- if (!conn->stream) {
-@@ -743,8 +720,9 @@
- if (!output) break;
-
- r = read_encoded(conn->stream, output + *new_len, ret);
-+
- if (r > 0) *new_len += r;
-- }
-+ } while (len || r == ret);
-
- if (r < 0 && output) {
- mem_free(output);
+++ /dev/null
---- elinks/src/document/session.h Wed May 15 06:40:09 2002
-+++ elinks_with_gzip/src/document/session.h Mon May 13 13:55:41 2002
-@@ -2,6 +2,15 @@
-
- #ifndef EL__DOCUMENT_SESSION_H
- #define EL__DOCUMENT_SESSION_H
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#ifdef HAVE_SSL
-+#include <openssl/ssl.h>
-+#endif
-+#ifdef HAVE_ZLIB_H
-+#include <zlib.h>
-+#endif
-
- /* We need to declare these first :/. Damn cross-dependencies. */
- struct session;
---- elinks/src/lowlevel/sched.c Wed May 15 06:40:15 2002
-+++ elinks_with_gzip/src/lowlevel/sched.c Mon May 13 21:42:33 2002
-@@ -5,10 +5,15 @@
- #include "config.h"
- #endif
-
-+
- #include <string.h>
- #ifdef HAVE_SSL
- #include <openssl/ssl.h>
- #endif
-+#ifdef HAVE_ZLIB_H
-+#include <zlib.h>
-+#endif
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-@@ -391,6 +396,12 @@
- {
- del_from_list(c);
- send_connection_info(c);
-+#ifdef HAVE_ZLIB_H
-+ if (c->z) {
-+ inflateEnd(c->z);
-+ mem_free(c->z);
-+ }
-+#endif
- mem_free(c->url);
- mem_free(c);
- }
---- elinks/src/lowlevel/sched.h Wed May 15 06:40:15 2002
-+++ elinks_with_gzip/src/lowlevel/sched.h Mon May 13 13:41:12 2002
-@@ -2,7 +2,15 @@
-
- #ifndef EL__LOWLEVEL_SCHED_H
- #define EL__LOWLEVEL_SCHED_H
--
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#ifdef HAVE_SSL
-+#include <openssl/ssl.h>
-+#endif
-+#ifdef HAVE_ZLIB_H
-+#include <zlib.h>
-+#endif
- #include "links.h" /* tcount, list_head */
- #include "document/cache.h"
- #include "lowlevel/ttime.h"
-@@ -74,6 +82,10 @@
- SSL *ssl;
- int no_tsl;
- #endif
-+#ifdef HAVE_ZLIB_H
-+ int gzip;
-+ z_streamp z;
-+#endif
- };
-
- #define S_WAIT 0
---- elinks/src/protocol/http/http.c Wed May 15 06:40:22 2002
-+++ elinks_with_gzip/src/protocol/http/http.c Wed May 15 06:32:28 2002
-@@ -8,6 +8,9 @@
- #ifdef HAVE_SSL
- #include <openssl/ssl.h>
- #endif
-+#ifdef HAVE_ZLIB_H
-+#include <zlib.h>
-+#endif
- #include <stdlib.h>
- #include <string.h>
-
-@@ -29,6 +32,7 @@
- #include "protocol/url.h"
- #include "util/base64.h"
- #include "util/blacklist.h"
-+#include "util/compress.h"
-
- struct http_connection_info {
- enum blacklist_flags bl_flags;
-@@ -121,6 +125,7 @@
- #endif
- }
- }
-+
- if (c->info && !((struct http_connection_info *)c->info)->close
- #ifdef HAVE_SSL
- && (!c->ssl) /* We won't keep alive ssl connections */
-@@ -401,7 +406,9 @@
- }
-
- add_to_str(&hdr, &l, "Accept: */*\r\n");
--
-+#ifdef HAVE_ZLIB_H
-+ add_to_str(&hdr, &l, "Accept-Encoding: gzip\r\n");
-+#endif
- if (!accept_charset) {
- unsigned char *cs, *ac;
- int aclen = 0;
-@@ -558,9 +565,27 @@
- int l = rb->len;
- if (info->length >= 0 && info->length < l) l = info->length;
- c->received += l;
-- if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0;
-+ if (l) {
-+#ifdef HAVE_ZLIB_H
-+ if (c->gzip) {
-+ int dl;
-+ unsigned char *data = decompress_gzip(&c->z, rb->data, l, &dl);
-+ if (!data) {
-+ setcstate(c, S_OUT_OF_MEM);
-+ abort_connection(c);
-+ return;
-+ }
-+ if (add_fragment(c->cache, c->from, data, dl) == 1) c->tries = 0;
-+ mem_free(data);
-+ c->from += dl;
-+ } else
-+#endif
-+ {
-+ if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0;
-+ c->from += l;
-+ }
-+ }
- if (info->length >= 0) info->length -= l;
-- c->from += l;
- kill_buffer_data(rb, l);
- if (!info->length && !rb->close) {
- setcstate(c, S_OK);
-@@ -604,9 +629,25 @@
- int l = info->chunk_remaining;
- if (l > rb->len) l = rb->len;
- c->received += l;
-- if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0;
- info->chunk_remaining -= l;
-- c->from += l;
-+#ifdef HAVE_ZLIB_H
-+ if (c->gzip) {
-+ int dl;
-+ unsigned char *data = decompress_gzip(&c->z, rb->data, l, &dl);
-+ if (!data) {
-+ setcstate(c, S_OUT_OF_MEM);
-+ abort_connection(c);
-+ return;
-+ }
-+ if (add_fragment(c->cache, c->from, data, dl) == 1) c->tries = 0;
-+ mem_free(data);
-+ c->from += dl;
-+ } else
-+#endif
-+ {
-+ if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0;
-+ c->from += l;
-+ }
- kill_buffer_data(rb, l);
- if (!info->chunk_remaining && rb->len >= 1) {
- if (rb->data[0] == 10) kill_buffer_data(rb, 1);
-@@ -846,6 +887,20 @@
- if (!e->last_modified && (d = parse_http_header(e->head, "Date", NULL)))
- e->last_modified = d;
- if (info->length == -1 || (version < 11 && info->close)) rb->close = 1;
-+#ifdef HAVE_ZLIB_H
-+ d = parse_http_header(e->head, "Content-Encoding", NULL);
-+ c->gzip = 0;
-+ if (d) {
-+ if (!strcasecmp(d, "gzip") || !strcasecmp(d, "x-gzip")) {
-+ mem_free(d);
-+ d = parse_http_header(e->head, "Content-Type", NULL);
-+ if (d) {
-+ if (!strncasecmp(d, "text", 4)) c->gzip = 1;
-+ mem_free(d);
-+ }
-+ }
-+ }
-+#endif
- read_http_data(c, rb);
- }
-
---- elinks/src/util/compress.c Wed May 15 06:40:24 2002
-+++ elinks_with_gzip/src/util/compress.c Wed May 15 06:37:29 2002
-@@ -23,7 +23,6 @@
- #include "util/compress.h"
-
-
--#if 0
- static void *
- z_mem_alloc(void *opaque, int items, int size)
- {
-@@ -35,7 +34,6 @@
- {
- mem_free(address);
- }
--#endif
-
-
- struct decoding_handlers {
-@@ -111,74 +109,162 @@
- gzclose((gzFile *) stream->data);
- }
-
--#if 0
--static unsigned char *
--decompress_gzip(unsigned char *stream, int cur_size, int *new_size)
--{
-- z_stream z;
-- char *stream_pos = stream;
-- char method, flags;
-- char *output;
-- int size;
-- int ret;
-+struct decoding_handlers gzip_handlers = {
-+ gzip_open,
-+ gzip_read,
-+ gzip_close,
-+};
-
-- output = mem_alloc(cur_size * 4);
-- if (!output) return stream;
-+#define WMAXBITS 15
-+#define ASCII_FLAG 0x01
-+#define HEAD_CRC 0x02
-+#define EXTRA_FIELD 0x04
-+#define ORIG_NAME 0x08
-+#define COMMENT 0x10
-+#define RESERVED 0xE0
-
-- z.opaque = NULL;
-- z.zalloc = (alloc_func) z_mem_alloc;
-- z.zfree = z_mem_free;
-- z.next_in = stream_pos;
-- z.next_out = output;
-- z.avail_out = size = cur_size * 4;
-- z.avail_in = cur_size + 1;
-+static z_streamp gzip_init(unsigned char *buf_old, int l) {
-+
-+/* check header */
-+/* gzip magic */
-+ unsigned char method;
-+ unsigned char flags;
-+ unsigned char *buf = buf_old;
-+ int len;
-+ int ret;
-+ z_streamp z;
-+
-+ if (buf[0] != 0x1f || buf[1] != 0x8b) return NULL;
-+
-+ method = buf[2];
-+ flags = buf[3];
-+
-+ if (method != Z_DEFLATED || (flags & RESERVED) != 0) return NULL;
-
-- /* XXX: Why -15? --pasky */
-- ret = inflateInit2(&z, -15);
-+/* Comments are borrowed from gzio.c - zlib */
-+/* Discard time, xflags and OS code: */
-+ buf += 10;
-+ l -= 10;
-+
-+ if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-+ len = 2 + buf[0] + (buf[1] << 8);
-+ buf += len;
-+ l -= len;
-+ }
-+ if (l <= 0) return NULL;
-+
-+ if ((flags & ORIG_NAME) != 0) {/* skip the original file name */
-+ len = strlen(buf) + 1;
-+ buf += len;
-+ l -= len;
-+ }
-+ if (l <= 0) return NULL;
-+
-+ if ((flags & COMMENT) != 0) {/* skip the .gz file comment */
-+ len = strlen(buf) + 1;
-+ buf += len;
-+ l -= len;
-+ }
-+ if (l <= 0) return NULL;
-
-- while (ret == Z_OK) {
-- char *output_new;
-+ if ((flags & HEAD_CRC) != 0) { /* skip the header crc */
-+ buf += 2;
-+ l -= 2;
-+ }
-+ if (l <= 0) return NULL;
-
-- ret = inflate(&z, Z_SYNC_FLUSH);
-+/* initialization of z_stream */
-+ z = (z_streamp)mem_alloc(sizeof(z_stream));
-+ if (!z) return NULL;
-+
-+ z->opaque = NULL;
-+ z->zalloc = (alloc_func)z_mem_alloc;
-+ z->zfree = (free_func)z_mem_free;
-+ z->avail_in = l;
-+ z->next_in = buf;
-+/* windowBits is passed < 0 to tell that there is no zlib header.
-+ * Note that in this case inflate *requires* an extra "dummy" byte
-+ * after the compressed stream in order to complete decompression and
-+ * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-+ * present after the compressed stream.
-+ */
-+ ret = inflateInit2(z, -WMAXBITS);
-+ if (ret == Z_OK) return z;
-+
-+ mem_free(z);
-+ return NULL;
-+}
-
-- if (ret == Z_STREAM_END) {
-- mem_free(stream);
-- *new_size = (int) z.total_out;
-- output = mem_realloc(output, z.total_out);
-- inflateEnd(&z);
-- return output;
-- }
-+#define OUTPUT_BUFFER_SIZE 65536
-
-- if (ret != Z_OK) {
-- inflateEnd(&z);
-- break;
-+unsigned char *decompress_gzip(z_streamp *z, unsigned char *buf, int l, int *dl)
-+{
-+ unsigned char *output;
-+ int cur_size;
-+ int new_size;
-+ int ret;
-+
-+ if (!*z) {
-+ *z = gzip_init(buf, l);
-+ if (!*z) {
-+ *dl = -1;
-+ return NULL;
- }
-+ }
-+ else {
-+ (*z)->next_in = buf;
-+ (*z)->avail_in = l;
-+ }
-
-- size += cur_size * 4;
--
-- output_new = mem_realloc(output, size);
-- if (!output_new) {
-- mem_free(output);
-- inflateEnd(&z);
-- return stream;
-+ (*z)->total_out = 0L;
-+ cur_size = OUTPUT_BUFFER_SIZE;
-+ output = mem_alloc(cur_size); /* output will be freed in http_read_data */
-+ if (!output) {
-+ inflateEnd(*z);
-+ mem_free(*z);
-+ *z = NULL;
-+ *dl = -2;
-+ return NULL;
-+ }
-+
-+ (*z)->next_out = output;
-+ (*z)->avail_out = 65536;
-+
-+ ret = inflate(*z, Z_SYNC_FLUSH);
-+ while (ret == Z_OK) {
-+ if (!(*z)->avail_in) {
-+ *dl = (int)(*z)->total_out;
-+ return output;
- }
--
-- output = output_new;
-- z.avail_out += cur_size * 4;
-- z.next_out = output + z.total_out;
-+
-+ new_size = cur_size + OUTPUT_BUFFER_SIZE;
-+ output = mem_realloc(output, new_size);
-+ if (!output) {
-+ inflateEnd(*z);
-+ mem_free(*z);
-+ *z = NULL;
-+ *dl = -3;
-+ return NULL;
-+ }
-+
-+ (*z)->next_out = output + cur_size; /* assume that z->avail_out == 0 */
-+ (*z)->avail_out = OUTPUT_BUFFER_SIZE;
-+ cur_size = new_size;
-+ ret = inflate(*z, Z_SYNC_FLUSH);
- }
-
-- mem_free(output);
-+ if (ret == Z_STREAM_END) *dl = (int)(*z)->total_out;
-+ else { /* something went wrong */
-+ *dl = -4;
-+ mem_free(output);
-+ output = NULL;
-+ }
-
-- return stream;
-+ inflateEnd(*z);
-+ mem_free(*z);
-+ *z = NULL;
-+ return output;
- }
--#endif
--
--struct decoding_handlers gzip_handlers = {
-- gzip_open,
-- gzip_read,
-- gzip_close,
--};
-
- #endif
-
---- elinks/src/util/compress.h Wed May 15 06:40:24 2002
-+++ elinks_with_gzip/src/util/compress.h Wed May 15 01:35:11 2002
-@@ -3,6 +3,13 @@
- #ifndef EL__UTIL_COMPRESS_H
- #define EL__UTIL_COMPRESS_H
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#ifdef HAVE_ZLIB_H
-+#include <zlib.h>
-+#endif
-+
- enum stream_encoding {
- ENCODING_NONE,
- ENCODING_GZIP,
-@@ -17,5 +24,8 @@
- struct stream_encoded *open_encoded(int, enum stream_encoding);
- int read_encoded(struct stream_encoded *, unsigned char *, int);
- void close_encoded(struct stream_encoded *);
-+#ifdef HAVE_ZLIB_H
-+unsigned char *decompress_gzip(z_streamp *, unsigned char *, int, int *);
-+#endif
-
- #endif
-
+++ /dev/null
--- Example hooks.lua file, put in ~/.links/ as hooks.lua.
--- $Id$
-
-
-----------------------------------------------------------------------
--- Local configuration
-----------------------------------------------------------------------
-
--- ** IMPORTANT **
--- For security reasons, systems functions are not enabled by default.
--- To do so, uncomment the following line, but be careful about
--- including unknown code. Individual functions may be disabled by
--- assigning them to `nil'.
-
- enable_systems_functions ()
-
- -- openfile = nil -- may open files in write mode
- -- readfrom = nil -- reading from pipe can execute commands
- -- writeto = nil
- -- appendto = nil
- -- pipe_read = nil
- -- remove = nil
- -- rename = nil
- -- execute = nil
- -- exit = nil
-
--- Home directory: If you do not enable system functions, you will
--- need to set the following to your home directory.
-
- home_dir = (getenv and getenv ("HOME")) or "/home/MYSELF"
- hooks_file = home_dir.."/.links/hooks.lua"
-
--- Pausing: When external programs are run, sometimes we need to pause
--- to see the output. This is the string we append to the command
--- line to do that. You may customise it if you wish.
-
- pause = '; echo -ne "\\n\\e[1;32mPress ENTER to continue...\\e[0m"; read'
-
--- When starting Netscape: Set to `nil' if you do not want to open a
--- new window for each document.
-
- netscape_new_window = 1
-
--- Make ALT="" into ALT=" ": Makes web pages with superfluous
--- images look better. However, even if you disable the "Display links
--- to images" option, single space links to such images will appear.
--- To enable, set the following to 1. If necessary, you can change
--- this while in Links using the Lua Console, then reload the page.
--- See also the keybinding section at the end of the file.
-
- mangle_blank_alt = nil
-
--- WWWoffle is a proxy/cache system designed for dial-up users.
--- If you have it, set this to the machine:port where it is installed
--- (e.g. "http://localhost:8080")
-
- wwwoffle = nil
-
--- If you set this to non-`nil', the bookmark addon will be loaded,
--- and actions will be bound to my key bindings. Change them at the
--- bottom of the file.
-
- bookmark_addon = nil
-
-
-----------------------------------------------------------------------
--- case-insensitive gsub
-----------------------------------------------------------------------
-
--- Please note that this is not completely correct yet.
--- It will not handle pattern classes like %a properly.
--- XXX: Fix this to handle pattern classes.
-
-function gisub (s, pat, repl, n)
- pat = gsub (pat, '(%a)',
- function (v) return '['..strupper(v)..strlower(v)..']' end)
- if n then
- return gsub (s, pat, repl, n)
- else
- return gsub (s, pat, repl)
- end
-end
-
-
-----------------------------------------------------------------------
--- goto_url_hook
-----------------------------------------------------------------------
-
-function match (prefix, url)
- return strsub (url, 1, strlen (prefix)) == prefix
-end
-
-function strip (str)
- return gsub (str, "^%s*(.-)%s*$", "%1")
-end
-
-function plusify (str)
- return gsub (str, "%s", "+")
-end
-
-function goto_url_hook (url, current_url)
-
- -- XXX: Use a table instead of if ... else ... else ...
-
- -- Google search (e.g. ,gg unix browsers).
- if match (",gg", url) then
- url = plusify (strip (strsub (url, 4)))
- return "http://www.google.com/search?q="..url.."&btnG=Google+Search"
-
- -- Freshmeat search.
- elseif match (",fm", url) then
- url = plusify (strip (strsub (url, 4)))
- return "http://www.freshmeat.net/search/?q="..url
-
- -- Appwatch search (e.g. ,aw lynx).
- elseif match (",aw", url) then
- url = plusify (strip (strsub (url, 4)))
- return "http://www.appwatch.com/Linux/Users/find?q="..url
-
- -- Dictionary.com search (e.g. ,dict congenial).
- elseif match (",dict", url) then
- url = plusify (strip (strsub (url, 6)))
- return "http://www.dictionary.com/cgi-bin/dict.pl?db=%2A&term="..url
-
- -- RPM search (e.g. ,rpm links).
- elseif match (",rpm", url) then
- url = plusify (strip (strsub (url, 5)))
- return "http://www.rpmfind.net/linux/rpm2html/search.php?query="
- ..url.."&submit=Search+..."
-
- -- Netcraft.com search (e.g. ,whatis www.google.com).
- elseif match (",whatis", url) then
- url = plusify (strip (strsub (url, 8)))
- return "http://uptime.netcraft.com/up/graph/?host="..url
-
- -- LinuxToday home page.
- elseif match (",lt", url) then
- return "http://linuxtoday.com/"
-
- -- User Friendly daily static.
- elseif match (",uf", url) then
- return "http://www.userfriendly.org/static/"
-
- -- Weather forecast for Melbourne, Australia.
- elseif match (",forecast", url) then
- return "http://www.bom.gov.au/cgi-bin/wrap_fwo.pl?IDF02V00.txt"
-
- -- Local network web server.
- elseif match (",local", url) then
- return "http://desky/"
-
- -- WWWoffle caches.
- elseif match (",cache", url) and wwwoffle then
- return wwwoffle.."/#indexes"
-
- -- Expand ~ to home directories.
- elseif match ("~", url) then
- if strsub(url, 2, 2) == "/" then -- ~/foo
- return home_dir..strsub(url, 2)
- else -- ~foo/bar
- return "/home/"..strsub(url, 2)
- end
-
- -- Unmatched.
- else
- return url
- end
-end
-
-
------------------------------------------------------------------------
--- follow_url_hook
----------------------------------------------------------------------
-
-function follow_url_hook (url)
- -- Using bookmark addon.
- if bookmark_addon then
- if bm_is_category (url) then
- return nil
- else
- return bm_get_bookmark_url (url) or url
- end
-
- -- Not using bookmark addon.
- else
- return url
- end
-end
-
-
-----------------------------------------------------------------------
--- pre_format_html_hook
-----------------------------------------------------------------------
-
--- Plain strfind (no metacharacters).
-function sstrfind (s, pattern)
- return strfind (s, pattern, 1, 1)
-end
-
-function pre_format_html_hook (url, html)
- local ret = nil
-
- -- Handle gzip'd files within reasonable size.
- if strfind (url, "%.gz$") and strlen (html) < 65536 then
- local tmp = tmpname ()
- writeto (tmp) write (html) writeto ()
- html = pipe_read ("(gzip -dc "..tmp.." || cat "..tmp..") 2>/dev/null")
- remove (tmp)
- ret = 1
- end
-
- -- Mangle ALT="" in IMG tags.
- if mangle_blank_alt then
- local n
- html, n = gisub (html, '(<img.-) alt=""', '%1 alt=" "')
- ret = ret or (n > 0)
- end
-
- -- These quick 'n dirty patterns don't maintain proper HTML.
-
- -- linuxtoday.com
- if sstrfind (url, "linuxtoday.com") then
- if sstrfind (url, "news_story") then
- html = gsub (html, '<TABLE CELLSPACING="0".-</TABLE>', '', 1)
- html = gsub (html, '<TR BGCOLOR="#FFF.-</TR></TABLE>', '', 1)
- else
- html = gsub (html, 'WIDTH="120">\n<TR.+</TABLE></TD>', '>', 1)
- end
- html = gsub (html, '<A HREF="http://www.internet.com.-</A>', '')
- html = gsub (html, "<IFRAME.-</IFRAME>", "")
- -- emphasis in text is lost
- return gsub (html, 'text="#002244"', 'text="#001133"', 1)
-
- -- linuxgames.com
- elseif sstrfind (url, "linuxgames.com") then
- return gsub (html, "<CENTER>.-</center>", "", 1)
-
- -- dictionary.com
- elseif sstrfind (url, "dictionary.com/cgi-bin/dict.pl") then
- local t = { t = "" }
- local _, n = gsub (html, "resultItemStart %-%-%>(.-)%<%!%-%- resultItemEnd",
- function (x) %t.t = %t.t.."<tr><td>"..x.."</td></tr>" end)
- if n == 0 then
- -- we've already mangled this page before
- return html
- else
- return "<html><head><title>Dictionary.com lookup</title></head>"..
- "<body><table border=1 cellpadding=5>"..t.t.."</table>"..
- "</body></html>"
- end
- end
-
- return ret and html
-end
-
-
-----------------------------------------------------------------------
--- Miscellaneous functions, accessed with the Lua Console.
-----------------------------------------------------------------------
-
--- Reload this file (hooks.lua) from within Links.
-function reload ()
- dofile (hooks_file)
-end
-
--- Helper function.
-function catto (output)
- local doc = current_document_formatted (79)
- if doc then writeto (output) write (doc) writeto () end
-end
-
--- Print the current document using `lpr'.
-function lpr ()
- -- You must compile Lua with `popen' support for pipes to work.
- -- See `config' in the Lua distribution.
- catto ("|lpr")
-end
-
--- Print the current document using `enscript'.
-function enscript ()
- catto ("|enscript -fCourier8")
-end
-
--- Ask WWWoffle to monitor the current page for us.
--- This only works when called from lua_console_hook, below.
-function monitor ()
- if wwwoffle then
- return "goto_url", wwwoffle.."/monitor-options/?"..current_url ()
- else
- return nil
- end
-end
-
--- Email the current document, using Mutt (http://www.mutt.org).
--- This only works when called from lua_console_hook, below.
-function mutt ()
- local tmp = tmpname ()
- writeto (tmp) write (current_document ()) writeto ()
- tinsert (tmp_files, tmp)
- return "run", "mutt -a "..tmp
-end
-
--- Open current document in Netscape.
-function netscape ()
- local new = netscape_new_window and ",new_window" or ""
- execute ("( netscape -remote 'openURL("..current_url ()..new..")'"
- .." || netscape '"..current_url ().."' ) 2>/dev/null &")
-end
-
--- If Links is ever the wrong size in your terminal emulator run
--- this to set the LINES and COLUMNS shell variables properly.
--- This only works when called from lua_console_hook, below.
-function resize ()
- return "run", "eval resize"
-end
-
--- Table of expressions which are recognised by our lua_console_hook.
-console_hook_functions = {
- reload = "reload ()",
- lpr = "lpr ()",
- enscript = "enscript ()",
- monitor = monitor,
- mutt = mutt,
- netscape = "netscape ()",
- nuts = "netscape ()",
- resize = resize
-}
-
-function lua_console_hook (expr)
- local x = console_hook_functions[expr]
- if type (x) == "function" then
- return x ()
- else
- return "eval", x or expr
- end
-end
-
-
-----------------------------------------------------------------------
--- quit_hook
-----------------------------------------------------------------------
-
--- We need to delete the temporary files that we create.
-if not tmp_files then
- tmp_files = {}
-end
-
-function quit_hook ()
- if bookmark_addon then
- bm_save_bookmarks ()
- end
-
- if tmp_files and remove then
- tmp_files.n = nil
- for i,v in tmp_files do remove (v) end
- end
-end
-
-
-----------------------------------------------------------------------
--- Examples of keybinding
-----------------------------------------------------------------------
-
--- Bind Ctrl-H to a "Home" page.
-
--- bind_key ("main", "Ctrl-H",
--- function () return "goto_url", "http://www.google.com/" end)
-
--- Bind Alt-p to print.
-
--- bind_key ("main", "Alt-p", lpr)
-
--- Bind Alt-m to toggle ALT="" mangling.
-
--- bind_key ("main", "Alt-m",
--- function () mangle_blank_alt = not mangle_blank_alt end)
-
-
-----------------------------------------------------------------------
--- Bookmark addon
-----------------------------------------------------------------------
-
-if bookmark_addon then
-
- dofile ("/usr/share/elinks/elinks-bm.lua")
-
- -- Add/change any bookmark options here.
-
- -- Be careful not to load bookmarks if this script is being
- -- reloaded while in Links, or we will lose unsaved changes.
- if not bm_bookmarks or getn (bm_bookmarks) == 0 then
- bm_load_bookmarks ()
- end
-
- -- My bookmark key bindings.
- bind_key ('main', 'a', bm_add_bookmark)
- bind_key ('main', 's', bm_view_bookmarks)
- bind_key ('main', 'Alt-e', bm_edit_bookmark)
- bind_key ('main', 'Alt-d', bm_delete_bookmark)
- bind_key ('main', 'Alt-k', bm_move_bookmark_up)
- bind_key ('main', 'Alt-j', bm_move_bookmark_down)
-
-end
-
-
--- vim: shiftwidth=4 softtabstop=4
+++ /dev/null
-diff -urN elinks-20020302/lua.c aaa/elinks-20020302/lua.c
---- elinks-20020302/lua.c Tue Feb 12 13:18:41 2002
-+++ aaa/elinks-20020302/lua.c Sun Mar 3 21:27:56 2002
-@@ -468,6 +468,7 @@
- lua_register(L, "edit_bookmark_dialog", l_edit_bookmark_dialog);
- lua_register(L, "xdialog", l_xdialog);
- do_hooks_file(L, "/etc/", "links-hooks.lua");
-+ do_hooks_file(L, "/etc/", "elinks-hooks.lua");
- if (links_home) do_hooks_file(L, links_home, "hooks.lua");
- }
-
+++ /dev/null
-Binary files aaa/elinks-0.4pre15/intl/.english.lng.swp and elinks-0.4pre15/intl/.english.lng.swp differ
-diff -urN aaa/elinks-0.4pre15/intl/polish.lng elinks-0.4pre15/intl/polish.lng
---- aaa/elinks-0.4pre15/intl/polish.lng Tue Aug 27 17:38:50 2002
-+++ elinks-0.4pre15/intl/polish.lng Thu Aug 29 14:15:42 2002
-@@ -49,14 +49,14 @@
- T_LINUX_OR_OS2_FRAMES, "Ramki typu Linux lub OS/2",
- T_KOI8R_FRAMES, "Ramki KOI8-R",
- T_USE_11M, "U¿yj ^[[11m",
--T_UTF_8_IO, NULL,
-+T_UTF_8_IO, "UTF-8 We/Wy",
- T_RESTRICT_FRAMES_IN_CP850_852, "Ogranicz ramki w cp850/852",
- T_BLOCK_CURSOR, "Kursor blokowy",
- T_COLOR, "Kolor",
- T_TERMINAL_OPTIONS, "Opcje terminala",
- T_HTTP_PROXY__HOST_PORT, "HTTP proxy (host:port)",
- T_FTP_PROXY__HOST_PORT, "FTP proxy (host:port)",
--T_NOPROXY_LIST, NULL,
-+T_NOPROXY_LIST, "Domeny bezpo¶redniego dostêpu (bez proxy)",
- T_MAX_CONNECTIONS, "Maksymalna liczba po³±czeñ",
- T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksymalna liczba po³±czeñ z jednym serwerem",
- T_RETRIES, "Próby",
-@@ -75,8 +75,8 @@
- T_NUMBERED_LINKS, "Numerowane linki",
- T_TEXT_MARGIN, "Margines tekstu",
- T_IGNORE_CHARSET_INFO_SENT_BY_SERVER, "Ignoruj informacje o zestawie znaków wysy³ane przez serwer",
--T_USE_DOCUMENT_COLOURS, NULL,
--T_ALLOW_DARK_ON_BLACK, NULL,
-+T_USE_DOCUMENT_COLOURS, "U¿ywaj kolorów okre¶lonych przez dokument",
-+T_ALLOW_DARK_ON_BLACK, "Dopuszczaj u¿ycie ciemnych kolorów na czarnym tle" ,
- T_HTML_OPTIONS, "Ustawienia HTML",
- T_DEFAULT_CODEPAGE, "Domy¶lna strona kodowa",
- T_GOTO_URL, "Przejd¼ do URL-a",
-@@ -118,15 +118,15 @@
- T_ENTER_URL, "Wprowad¼ URL",
- T_SAVE_URL, "Zapisz URL",
- T_DOWNLOAD, "Pobieranie",
--T_DOWNLOAD_COMPLETE, NULL,
-+T_DOWNLOAD_COMPLETE, "Pobieranie zakoñczone",
- T_SAVE_TO_FILE, "Zapisz do pliku",
- T_SEARCH_FOR_TEXT, "Znajd¼ tekst",
- T_WAITING_IN_QUEUE, "Oczekuj±ce w kolejce",
- T_LOOKING_UP_HOST, "Szukam serwera",
- T_MAKING_CONNECTION, "Nawi±zywanie po³±czenia",
--T_SSL_NEGOTIATION, NULL,
-+T_SSL_NEGOTIATION, "Negocjacja SSL",
- T_REQUEST_SENT, "¯±danie wys³ane",
--T_LOGGING_IN, NULL,
-+T_LOGGING_IN, "Logujê siê",
- T_GETTING_HEADERS, "Pobieranie nag³ówków",
- T_SERVER_IS_PROCESSING_REQUEST, "Serwer przetwarza ¿±danie",
- T_TRANSFERRING, "Przesy³anie",
-@@ -145,11 +145,11 @@
- T_CANT_GET_SOCKET_STATE, "Nie mo¿na zbadaæ stanu gniazda",
- T_BAD_HTTP_RESPONSE, "Nieprawid³owa odpowied¼ HTTP",
- T_HTTP_100, NULL,
--T_FAKE_REFERER, NULL,
--T_REFERER_NONE, NULL,
--T_REFERER_TRUE, NULL,
--T_REFERER_SAME_URL, NULL,
--T_REFERER_FAKE, NULL,
-+T_FAKE_REFERER, "Sta³e odwo³anie HTTP",
-+T_REFERER_NONE, "Brak odwo³ania",
-+T_REFERER_TRUE, "Wy¶lij poprzedni URL jako odwo³anie (normalna operacja, NIEBEZPIECZNE)",
-+T_REFERER_SAME_URL, "Wy¶lij ¿±dany URL jako odwo³anie",
-+T_REFERER_FAKE, "Sta³e odwo³anie",
- T_NO_CONTENT, "Plik pusty",
- T_UNKNOWN_FILE_TYPE, "Nieznay typ pliku",
- T_ERROR_OPENING_FILE, "B³±d przy otwieraniu pliku",
-@@ -170,7 +170,7 @@
- T_ELAPSED_TIME, "Up³ynê³o",
- T_ESTIMATED_TIME, "Pozosta³y czas",
- T_BACKGROUND, "W tle",
--T_BACKGROUND_NOTIFY, NULL,
-+T_BACKGROUND_NOTIFY, "W tle z powiadomieniem",
- T_ABORT, "Przerwij",
- T_YES, "Tak",
- T_NO, "Nie",
-@@ -188,7 +188,7 @@
- T_SAVE_IT_OR_DISPLAY_IT, "otworzyæ, zapisaæ czy wy¶wietliæ?",
- T_OPEN, "Otwórz",
- T_DO_YOU_WANT_TO_FOLLOW_REDIRECT_AND_POST_FORM_DATA_TO_URL, "Czy chcesz przekierowaæ i wys³aæ dane formularza do",
--T_USER_AGENT, NULL,
-+T_USER_AGENT, "Identyfikator przegl±darki",
- T_DO_YOU_WANT_TO_POST_FORM_DATA_TO_URL, "Chcesz wys³aæ formularz do",
- T_DO_YOU_WANT_TO_REPOST_FORM_DATA_TO_URL, "Chcesz ponownie wys³aæ formularz do",
- T_WARNING, "Ostrze¿enie",
-@@ -219,12 +219,12 @@
- T_ERROR_WRITING_TO_FILE, "B³±d zapisu do pliku",
- T_DISPLAY_USEMAP, "Poka¿ mapê obrazków",
- T_FOLLOW_LINK, "Wybierz link",
--T_FOLLOW_LINK_RELOAD, NULL,
-+T_FOLLOW_LINK_RELOAD, "Wybierz link i prze³aduj",
- T_OPEN_IN_NEW_WINDOW, "Otwórz w nowym oknie",
- T_DOWNLOAD_LINK, "Pobierz",
- T_RESET_FORM, "Wyczy¶æ formularz",
- T_SUBMIT_FORM, "Prze¶lij formularz",
--T_SUBMIT_FORM_RELOAD, NULL,
-+T_SUBMIT_FORM_RELOAD, "Prze¶lij formularz i prze³aduj",
- T_SUBMIT_FORM_AND_OPEN_IN_NEW_WINDOW, "Prze¶lij formularz i otwórz w nowym oknie",
- T_SUBMIT_FORM_AND_DOWNLOAD, "Prze¶lij formularz i ¶ci±gnij",
- T_VIEW_IMAGE, "Poka¿ obrazek",
-@@ -247,14 +247,14 @@
- T_SUBMIT_TO, "przes³aæ do",
- T_POST_TO, "wys³aæ do",
- T_INFO, "Informacja",
--T_HEADER_INFO, NULL,
-+T_HEADER_INFO, "Informacje o nag³ówku",
- T_YOU_ARE_NOWHERE, "Tak naprawdê to jeste¶ nigdzie!",
- T_URL, "URL",
- T_SIZE, "Rozmiar",
--T_TITLE, NULL,
--T_LAST_VISIT_TIME, NULL,
--T_LINK_TITLE, NULL,
--T_UNKNOWN, NULL,
-+T_TITLE, "Tytu³",
-+T_LAST_VISIT_TIME, "Data ostatniej wizyty",
-+T_LINK_TITLE, "Tytu³ linku",
-+T_UNKNOWN, "Nieznany",
- T_INCOMPLETE, "niekompletne",
- T_CODEPAGE, "Strona kodowa",
- T_ASSUMED, "Domy¶lna",
-@@ -284,11 +284,11 @@
- T_EDIT_BOOKMARK, "Edytuj zak³adkê",
- T_DELETE_BOOKMARK, "Usuñ zak³adkê",
- T_BOOKMARK_MANAGER, "Obs³uga zak³adek",
--T_GLOBAL_HISTORY, NULL,
--T_HISTORY_MANAGER, NULL,
--T_DELETE_HISTORY_ITEM, NULL,
--T_CLEAR_GLOBAL_HISTORY, NULL,
--T_SEARCH_HISTORY, NULL,
-+T_GLOBAL_HISTORY, "Historia globalna",
-+T_HISTORY_MANAGER, "Historia globalna",
-+T_DELETE_HISTORY_ITEM, "Usuñ pozycjê historii",
-+T_CLEAR_GLOBAL_HISTORY, "Wyczy¶æ historiê globaln±",
-+T_SEARCH_HISTORY, "Przeszukaj historiê",
- T_NNAME, "Nazwa",
- T_EXIT_LINKS, "Wyjd¼ z linksa",
- T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS, "Czy na pewno chcesz wyj¶æ z linksa",
-@@ -314,13 +314,13 @@
- T_BAD_MAILTO_URL, "B³êdny adres e-mail",
- T_BAD_TELNET_URL, "Niew³a¶ciwy adres serwera dla programu Telnet",
- T_BAD_TN3270_URL, "Niew³a¶ciwy adres serwera dla programu Tn3270",
--T_USERID, NULL,
--T_PASSWORD, NULL,
--T_ENTER_USERNAME, NULL,
--T_AUTHEN, NULL,
-+T_USERID, "Nazwa u¿ytkownika",
-+T_PASSWORD, "Has³o",
-+T_ENTER_USERNAME, "Potrzebne uwierzytelnienie dla ",
-+T_AUTHEN, "Uwierzytelnienie HTTP",
- T_AT, NULL,
--T_SSL_ERROR, NULL,
--T_NO_SSL, NULL,
-+T_SSL_ERROR, "B³±d SSL",
-+T_NO_SSL, "Ta wersja elinksa nie posiada wsparcia dla SSL/TSL",
- T_HK_ADD_BOOKMARK, "D",
- T_HK_BOOKMARKS, "Z",
- T_HK_GLOBAL_HISTORY, NULL,
-@@ -390,18 +390,18 @@
- T_HK_FULL_SCREEN, NULL,
- T_HK_BEOS_TERMINAL, NULL,
- T_HK_NEW_WINDOW, NULL,
--T_FEATURES, NULL,
--T_LUA_ERROR, NULL,
--T_LUA_CONSOLE, NULL,
--T_ENTER_EXPRESSION, NULL,
-+T_FEATURES, "Mo¿liwo¶ci",
-+T_LUA_ERROR, "B³±d Lua",
-+T_LUA_CONSOLE, "Konsola Lua",
-+T_ENTER_EXPRESSION, "Wprowad¼ wyra¿enie",
- T_XDIALOG_TITLE, NULL,
--T_XDIALOG_FIELD, NULL,
--T_NEED_MASTER_TERMINAL, NULL,
--T_SEARCH_BOOKMARK, NULL,
--T_CLEAR, NULL,
--T_ADD_BOOKMARK_LINK, NULL,
-+T_XDIALOG_FIELD, "Pole",
-+T_NEED_MASTER_TERMINAL, "Mo¿esz zrobiæ to jedynie na g³ównym terminalu",
-+T_SEARCH_BOOKMARK, "Przeszukaj zak³adki",
-+T_CLEAR, "Wyczy¶æ",
-+T_ADD_BOOKMARK_LINK, "Dodaj zak³adkê",
- T_HK_ADD_BOOKMARK_LINK, NULL,
--T_ACCEPT_LANGUAGE, NULL,
--T_ACCEPT_UI_LANGUAGE, NULL,
--T_SSL_CIPHER, NULL,
--T_ENCODING, NULL,
-+T_ACCEPT_LANGUAGE, "Preferowany jêzyk (lista kodów ISO oddzielona przecinkami)",
-+T_ACCEPT_UI_LANGUAGE, "Jêzyk interfejsu taki jak Zaakceptowane-Jêzyki (ma³a strata na prywatno¶ci)",
-+T_SSL_CIPHER, "Szyfr SSL",
-+T_ENCODING, "Kodowanie",
+++ /dev/null
---- elinks-0.4.0rc4/intl/polish.lng.orig Sat Dec 21 00:31:29 2002
-+++ elinks-0.4.0rc4/intl/polish.lng Tue Dec 24 00:35:49 2002
-@@ -10,12 +10,12 @@
- T_CONFIG_ERROR, "B³±d konfiguracji",
- T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nie mo¿na zapisaæ do pliku konfiguracyjnego",
- T_ABOUT, "O programie",
--T_LINKS__LYNX_LIKE, "Tekstowa przegladarka WWW" ,
-+T_LINKS__LYNX_LIKE, "Tekstowa przegl±darka WWW" ,
- T_OK, "OK",
- T_KEYS, "Klawiszologia",
- T_KEYS_DESC, "ESC poka¿ menu\n^C, q wyj¶cie\n^P, ^N przewiñ góra/dó³\n[, ] przewiñ lewo/prawo\ngóra, dó³ zaznacz link\n-> wybierz link\n<- powrót\ng przejd¼ do URL\nG przejd¼ do URL bazuj±cego na aktualnym\n/ szukaj\n? szukaj wstecz\nn znajd¼ nastêpny\nN znajd¼ poprzedni\n= informacje o dokumencie\n\\ ¼ród³o dokumentu\nd pobierz",
- T_COPYING, "Kopiowanie",
--T_COPYING_DESC, "ELinks " VERSION_STRING "\n\n(C) 1999 - 2002 Mikulas Patocka\n(C) 2001 - 2002 Petr Baudis\n\nNiniejszy program jest oprogramowaniem wolnodostêpnym; mo¿esz go rozprowadzaæ dalej i/lub modyfikowaæ na warunkach GPL GNU, wydanej przez Free Software Fundation - wed³ug wersji 2-giej tej Licencji lub której¶ z pó¼niejszych wersji.",
-+T_COPYING_DESC, "ELinks " VERSION_STRING "\n\n(C) 1999 - 2002 Mikulas Patocka\n(C) 2001 - 2002 Petr Baudis\n\nNiniejszy program jest oprogramowaniem wolnodostêpnym; mo¿esz go rozprowadzaæ dalej i/lub modyfikowaæ na warunkach GPL GNU, wydanej przez Free Software Foundation - wed³ug wersji 2-giej tej Licencji lub której¶ z pó¼niejszych wersji.",
- T_RESOURCES, "Zasoby",
- T_HANDLES, "uchwyt(ów)",
- T_TIMERS, "zegar(ów)",
-@@ -48,12 +48,12 @@
- T_VT_100_FRAMES, "Ramki VT100",
- T_LINUX_OR_OS2_FRAMES, "Ramki typu Linux lub OS/2",
- T_KOI8R_FRAMES, "Ramki KOI8-R",
--T_USE_11M, "U¿yj ^[[11m",
-+T_USE_11M, "U¿ywaj ^[[11m",
- T_UTF_8_IO, "Wej¶cie/wyj¶cie w UTF-8",
- T_RESTRICT_FRAMES_IN_CP850_852, "Ogranicz ramki w cp850/852",
- T_BLOCK_CURSOR, "Kursor blokowy",
- T_COLOR, "Kolor",
--T_TRANSPARENCY, NULL,
-+T_TRANSPARENCY, "Przezroczysto¶æ",
- T_TERMINAL_OPTIONS, "Opcje terminala",
- T_GOTO_URL, "Przejd¼ do URL-a",
- T_GO_BACK, "Wróæ",
-@@ -63,7 +63,7 @@
- T_SAVE_AS, "Zapisz jako",
- T_SAVE_URL_AS, "Zapisz URL jako",
- T_SAVE_FORMATTED_DOCUMENT, "Zapisz sformatowany dokument",
--T_KILL_BACKGROUND_CONNECTIONS, "Przerwij wszystkie po³aczenia w tle",
-+T_KILL_BACKGROUND_CONNECTIONS, "Przerwij wszystkie po³±czenia w tle",
- T_FLUSH_ALL_CACHES, "Wyczy¶æ ca³± pamiêæ podrêczn±",
- T_RESOURCE_INFO, "Informacje o zasobach",
- T_OS_SHELL, "Pow³oka systemowa",
-@@ -85,7 +85,7 @@
- T_SAVE_OPTIONS, "Zapisz opcje",
- T_FILE, "Plik",
- T_VIEW, "Widok",
--T_LINK, NULL,
-+T_LINK, "Link",
- T_DOWNLOADS, "Pobieranie",
- T_SETUP, "Ustawienia",
- T_HELP, "Pomoc",
-@@ -118,7 +118,7 @@
- T_REQUEST_MUST_BE_RESTARTED, "¯±danie musi byæ powtórzone",
- T_CANT_GET_SOCKET_STATE, "Nie mo¿na zbadaæ stanu gniazda",
- T_BAD_HTTP_RESPONSE, "Nieprawid³owa odpowied¼ HTTP",
--T_HTTP_100, NULL,
-+T_HTTP_100, "HTTP 100 (\?\?\?)",
- T_NO_CONTENT, "Plik pusty",
- T_UNKNOWN_FILE_TYPE, "Nieznany typ pliku",
- T_ERROR_OPENING_FILE, "B³±d przy otwieraniu pliku",
-@@ -163,7 +163,7 @@
- T_ERROR, "B³±d",
- T_WELCOME, "Powitanie",
- T_WELCOME_TO_LINKS, "Witaj w programie Links!",
--T_BASIC_HELP, "Wci¶nij ESC aby wywo³aæ menu. Wybierz Pomoc->Podrêcznik z menu aby zapoznac siê z instrukcj± u¿ytkowania programu.",
-+T_BASIC_HELP, "Wci¶nij ESC aby wywo³aæ menu. Wybierz Pomoc->Podrêcznik z menu aby zapoznaæ siê z instrukcj± u¿ytkowania programu.",
- #T_LABEL, "Etykieta",
- #T_CONTENT_TYPES, "Typ(y) zawarto¶ci",
- #T_PROGRAM__IS_REPLACED_WITH_FILE_NAME, "Program ('%' jest zastêpowany nazw± pliku)",
-@@ -181,7 +181,7 @@
- T_NO_EXTENSIONS, "Brak rozszerzeñ",
- T_ERROR_WHILE_POSTING_FORM, "Wyst±pi³ b³±d podczas wysy³ania formularza",
- T_COULD_NOT_GET_FILE, "Nie mo¿na pobraæ pliku",
--T_NO_PREVIOUS_SEARCH, "Niczego wsze¶niej nie szukano",
-+T_NO_PREVIOUS_SEARCH, "Niczego wcze¶niej nie szukano",
- T_SEARCH_STRING_NOT_FOUND, "Nie znaleziono wyra¿enia",
- T_SAVE_ERROR, "B³±d zapisu",
- T_ERROR_WRITING_TO_FILE, "B³±d zapisu do pliku",
-@@ -203,14 +203,14 @@
- T_SUBMIT_FORM_TO, "Prze¶lij formularz do",
- T_POST_FORM_TO, "Wy¶lij formularz do",
- T_RADIO_BUTTON, "Okr±g³y przycisk",
--T_CHECKBOX, NULL,
-+T_CHECKBOX, "Przycisk wyboru",
- T_SELECT_FIELD, "Pole wyboru",
- T_TEXT_FIELD, "Pole tekstowe",
- T_TEXT_AREA, "Pole tekstowe",
- T_FILE_UPLOAD, "£adowanie pliku",
- T_PASSWORD_FIELD, "Pole has³a",
- T_NAME, "nazwa",
--T_VALUE, "Warto¶æ",
-+T_VALUE, "warto¶æ",
- T_HIT_ENTER_TO, "wci¶nij ENTER aby",
- T_SUBMIT_TO, "przes³aæ do",
- T_POST_TO, "wys³aæ do",
-@@ -231,9 +231,9 @@
- T_DATE, "Data",
- T_LAST_MODIFIED, "Ostatnia zmiana",
- T_LANGUAGE, "Jêzyk",
--T_XTERM, "X-Terminal",
--T_TWTERM, NULL,
--T_SCREEN, NULL,
-+T_XTERM, "Xterm",
-+T_TWTERM, "Twterm",
-+T_SCREEN, "Screen",
- T_WINDOW, "Okno",
- T_FULL_SCREEN, "Pe³ny ekran",
- T_BEOS_TERMINAL, "Terminal BeOS",
-@@ -377,26 +377,26 @@
- T_TYPE_LANGUAGE, "Jêzyk",
- T_TYPE_COLOR, "Kolor",
- T_TYPE_SPECIAL, "Specjalny",
--T_TYPE_ALIAS, NULL,
--T_TYPE_FOLDER, NULL,
--T_JS_NOT_SUPPORTED, NULL,
--T_ADD_OPTION, NULL,
--T_CANNOT_ADD_OPTION_HERE, NULL,
--T_DELETE_OPTION, NULL,
--T_CANNOT_DELETE_OPTION_HERE, NULL,
--T_REALLY_DELETE_OPTION, NULL,
-+T_TYPE_ALIAS, "Alias",
-+T_TYPE_FOLDER, "Folder",
-+T_JS_NOT_SUPPORTED, "JavaScript aktualnie nie jest obs³ugiwany.",
-+T_ADD_OPTION, "Dodaj opcjê",
-+T_CANNOT_ADD_OPTION_HERE, "Tutaj nie mo¿na dodaæ opcji.",
-+T_DELETE_OPTION, "Usuñ opcjê",
-+T_CANNOT_DELETE_OPTION_HERE, "Tutaj nie mo¿na usun±æ opcji.",
-+T_REALLY_DELETE_OPTION, "Naprawdê usun±æ tê opcjê",
- T_HK_OPTIONS_MANAGER, NULL,
--T_KEYBINDING_MANAGER, NULL,
--T_DELETE_KEYBINDING, NULL,
--T_NOT_A_KEYBINDING, NULL,
--T_REALLY_DELETE_KEYBINDING, NULL,
--T_KEYMAP, NULL,
--T_ADD_KEYBINDING, NULL,
--T_NEED_TO_SELECT_KEYMAP, NULL,
--T_ACTION, NULL,
--T_AACTION, NULL,
--T_KKEYMAP, NULL,
--T_KEYSTROKE_HELP, NULL,
--T_KEYSTROKE, NULL,
--T_INVALID_KEYSTROKE, NULL,
-+T_KEYBINDING_MANAGER, "Menad¿er przypisañ klawiszy",
-+T_DELETE_KEYBINDING, "Usuñ przypisanie",
-+T_NOT_A_KEYBINDING, "Ten element nie jest przypisaniem. Spróbuj nacisn±æ spacjê, aby uzyskaæ w³a¶ciwe przypisania.",
-+T_REALLY_DELETE_KEYBINDING, "Naprawdê usun±æ przypisanie",
-+T_KEYMAP, "mapa klawiszy",
-+T_ADD_KEYBINDING, "Dodaj przypisanie",
-+T_NEED_TO_SELECT_KEYMAP, "Trzeba wybraæ mapê klawiszy.",
-+T_ACTION, "Akcja",
-+T_AACTION, "akcja",
-+T_KKEYMAP, "Mapa klawiszy",
-+T_KEYSTROKE_HELP, "Kombinacja klawiszy powinna byæ zapisana w formacie: [Prefiks-]Klawisz\nPrefiks: Shift, Ctrl, Alt\nKlawisz: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...",
-+T_KEYSTROKE, "Kombinacja klawiszy",
-+T_INVALID_KEYSTROKE, "B³êdna kombinacja klawiszy",
- T_HK_KEYBINDING_MANAGER, NULL,
projects / packages / elinks.git / commitdiff