SOURCES: elinks-home_etc.patch, elinks-date-format.patch - updated to 0.12pre1
witekfl
witekfl at pld-linux.org
Tue Jul 1 19:07:42 CEST 2008
Author: witekfl Date: Tue Jul 1 17:07:42 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 0.12pre1
---- Files affected:
SOURCES:
elinks-home_etc.patch (1.3 -> 1.4) , elinks-date-format.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/elinks-home_etc.patch
diff -u SOURCES/elinks-home_etc.patch:1.3 SOURCES/elinks-home_etc.patch:1.4
--- SOURCES/elinks-home_etc.patch:1.3 Mon May 12 18:58:07 2008
+++ SOURCES/elinks-home_etc.patch Tue Jul 1 19:07:35 2008
@@ -1,7 +1,6 @@
-diff -burN elinks-0.11.0.orig/doc/man/man1/elinks.1.in elinks-0.11.0/doc/man/man1/elinks.1.in
---- elinks-0.11.0.orig/doc/man/man1/elinks.1.in 2006-01-01 21:59:35.921524250 +0100
-+++ elinks-0.11.0/doc/man/man1/elinks.1.in 2006-01-01 22:01:19.884021500 +0100
-@@ -320,6 +320,12 @@
+--- elinks-0.12pre1/doc/man/man1/elinks.1.in.old 2008-07-01 02:11:44.000000000 +0200
++++ elinks-0.12pre1/doc/man/man1/elinks.1.in 2008-07-01 18:36:50.000000000 +0200
+@@ -315,6 +315,12 @@ The path to the users home directory. Us
~/.
.RE
.PP
@@ -14,15 +13,15 @@
WWW_HOME
.RS 4
Homepage location (as in
-diff -burN elinks-0.11.0.orig/src/config/home.c elinks-0.11.0/src/config/home.c
---- elinks-0.11.0.orig/src/config/home.c 2006-01-01 21:59:35.845519500 +0100
-+++ elinks-0.11.0/src/config/home.c 2006-01-01 22:00:36.489309500 +0100
-@@ -109,7 +109,7 @@
+--- elinks-0.12pre1/src/config/home.c.old 2008-07-01 02:11:44.000000000 +0200
++++ elinks-0.12pre1/src/config/home.c 2008-07-01 18:41:01.000000000 +0200
+@@ -110,7 +110,8 @@ static unsigned char *
get_home(void)
{
unsigned char *home_elinks;
- unsigned char *envhome = getenv("HOME");
-+ unsigned char *envhome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME");
- unsigned char *home = envhome ? stracpy(envhome)
- : elinks_dirname(program.path);
++ unsigned char *home_etc = getenv("HOME_ETC");
++ unsigned char *envhome = home_etc ? home_etc : getenv("HOME");
+ unsigned char *home = NULL;
+ if (!home && envhome)
================================================================
Index: SOURCES/elinks-date-format.patch
diff -u SOURCES/elinks-date-format.patch:1.1 SOURCES/elinks-date-format.patch:1.2
--- SOURCES/elinks-date-format.patch:1.1 Sun Dec 2 02:11:41 2007
+++ SOURCES/elinks-date-format.patch Tue Jul 1 19:07:36 2008
@@ -20,47 +20,6 @@
}
---- elinks-0.11.3/src/protocol/ftp/ftp.c.orig 2007-12-02 01:03:26.739361000 +0100
-+++ elinks-0.11.3/src/protocol/ftp/ftp.c 2007-12-02 01:23:34.644196437 +0100
-@@ -1147,7 +1147,7 @@ display_dir_entry(struct cache_entry *ca
- time_t when = ftp_info->mtime;
- struct tm *when_tm;
- unsigned char *fmt;
-- unsigned char date[13];
-+ unsigned char date[MAX_STR_LEN];
- int wr;
-
- if (ftp_info->local_time_zone)
-@@ -1157,20 +1157,19 @@ display_dir_entry(struct cache_entry *ca
-
- if (current_time > when + 6L * 30L * 24L * 60L * 60L
- || current_time < when - 60L * 60L)
-- fmt = "%b %e %Y";
-+ fmt = gettext("%b %e %Y");
- else
-- fmt = "%b %e %H:%M";
-+ fmt = gettext("%b %e %H:%M");
-
-- wr = strftime(date, sizeof(date), fmt, when_tm);
--
-- while (wr < sizeof(date) - 1) date[wr++] = ' ';
-- date[sizeof(date) - 1] = '\0';
-- add_to_string(&string, date);
-+ if (strftime(date, sizeof(date), fmt, when_tm) <= 0)
-+ add_to_string(&string, gettext(" "));
-+ else {
-+ add_to_string(&string, date);
-+ add_char_to_string(&string, ' ');
-+ }
- } else
- #endif
-- add_to_string(&string, " ");
--
-- add_char_to_string(&string, ' ');
-+ add_to_string(&string, gettext(" "));
-
- if (ftp_info->type == FTP_FILE_DIRECTORY && colorize_dir) {
- add_to_string(&string, "<font color=\"");
--- elinks-0.11.3/po/pl.po.orig 2007-04-15 22:51:02.000000000 +0200
+++ elinks-0.11.3/po/pl.po 2007-12-02 01:29:45.701341779 +0100
@@ -7428,6 +7428,18 @@
@@ -82,3 +41,43 @@
#. name:
#: src/protocol/gopher/gopher.c:46
msgid "Gopher"
+--- elinks-0.12pre1/src/protocol/ftp/ftp.c.old 2008-07-01 18:51:59.000000000 +0200
++++ elinks-0.12pre1/src/protocol/ftp/ftp.c 2008-07-01 18:59:09.000000000 +0200
+@@ -1185,7 +1185,7 @@ display_dir_entry(struct cache_entry *ca
+ /* LC_TIME=fi_FI.UTF_8 can generate "elo___ 31 23:59"
+ * where each _ denotes U+00A0 encoded as 0xC2 0xA0,
+ * thus needing a 19-byte buffer. */
+- unsigned char date[80];
++ unsigned char date[MAX_STR_LEN];
+ int wr;
+
+ if (ftp_info->local_time_zone)
+@@ -1195,16 +1195,16 @@ display_dir_entry(struct cache_entry *ca
+
+ if (current_time > when + 6L * 30L * 24L * 60L * 60L
+ || current_time < when - 60L * 60L)
+- fmt = "%b %e %Y";
++ fmt = gettext("%b %e %Y");
+ else
+- fmt = "%b %e %H:%M";
++ fmt = gettext("%b %e %H:%M");
+
+ wr = strftime(date, sizeof(date), fmt, when_tm);
+ add_cp_html_to_string(&string, format->libc_codepage,
+ date, wr);
+ } else
+ #endif
+- add_to_string(&string, " ");
++ add_to_string(&string, gettext(" "));
+ /* TODO: Above, the number of spaces might not match the width
+ * of the string generated by strftime. It depends on the
+ * locale. So if ELinks knows the timestamps of some FTP
+@@ -1218,8 +1218,6 @@ display_dir_entry(struct cache_entry *ca
+ * Any solution chosen here should also be applied to the
+ * file: protocol handler. */
+
+- add_char_to_string(&string, ' ');
+-
+ if (ftp_info->type == FTP_FILE_DIRECTORY && format->colorize_dir) {
+ add_to_string(&string, "<font color=\"");
+ add_to_string(&string, format->dircolor);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/elinks-home_etc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/elinks-date-format.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list