Contents of /trunk/lynx/patches/lynx-2.8.5rel.2.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 6991 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 6991 byte(s)
-import
1 | # ------------------------------------------------------------------------------ |
2 | # CHANGES | 11 +++++++++++ |
3 | # README | 2 +- |
4 | # WWW/Library/Implementation/HTString.c | 6 +++++- |
5 | # WWW/Library/Implementation/HTUtils.h | 4 ++++ |
6 | # configure | 2 +- |
7 | # configure.in | 4 ++-- |
8 | # lynx.cfg | 4 ++-- |
9 | # src/HTAlert.c | 17 ++++++++++------- |
10 | # src/LYKeymap.c | 7 +++++-- |
11 | # userdefs.h | 4 ++-- |
12 | # 10 files changed, 43 insertions(+), 18 deletions(-) |
13 | # ------------------------------------------------------------------------------ |
14 | Index: CHANGES |
15 | --- 2.8.5rel.1/CHANGES Wed Feb 4 04:07:09 2004 |
16 | +++ 2.8.5rel.2/CHANGES Thu Apr 22 16:08:10 2004 |
17 | @@ -1,6 +1,17 @@ |
18 | Changes since Lynx 2.8 release |
19 | =============================================================================== |
20 | |
21 | +2004-04-22 (2.8.5rel.2 fixes from 2.8.6dev.1) |
22 | +* correct ifdef in LYgetattrs() to ensure that getattrs() is used only if the |
23 | + configure script actually found it (report/patch by Paul Gilmartin). |
24 | +* correct LYcommandList() to allocate data passed to HTList_addObject(), since |
25 | + LYRemoveFromCloset() may free it (report by FLWM) -TD |
26 | +* add a null-pointer check to parameter of HTQuoteParameter(), fixes bug |
27 | + introduced in 2.8.5pre.4 (report by FLWM) -TD |
28 | +* correct units shown by HTReadProgress() for very low rates - bug from |
29 | + 2.8.5pre.3 changes (report by PG) -TD |
30 | +* update current-version in README -LP |
31 | + |
32 | 2004-02-04 (2.8.5rel.1) |
33 | * build fixes for MINGW32 -DK |
34 | * build fixes for OS/2 (reported by IZ) -TD |
35 | Index: README |
36 | --- 2.8.5rel.1/README Sat Jan 24 17:51:04 2004 |
37 | +++ 2.8.5rel.2/README Thu Apr 22 16:08:10 2004 |
38 | @@ -1,7 +1,7 @@ |
39 | |
40 | Lynx README file |
41 | |
42 | -Lynx Version 2.8.4 is the latest release (July 2001). |
43 | +Lynx Version 2.8.5 is the latest release (February 2004). |
44 | See the CHANGES file for a complete record of all changes and bug fixes. |
45 | New releases are announced on the lynx-dev mailing list (see below). |
46 | |
47 | Index: WWW/Library/Implementation/HTString.c |
48 | --- 2.8.5rel.1/WWW/Library/Implementation/HTString.c Wed Jan 28 11:30:38 2004 |
49 | +++ 2.8.5rel.2/WWW/Library/Implementation/HTString.c Thu Apr 22 16:08:10 2004 |
50 | @@ -877,11 +877,15 @@ |
51 | CONST char *, parameter) |
52 | { |
53 | size_t i; |
54 | - size_t last = strlen(parameter); |
55 | + size_t last; |
56 | size_t n = 0; |
57 | size_t quoted = 0; |
58 | char * result; |
59 | |
60 | + if (parameter == 0) |
61 | + parameter = ""; |
62 | + |
63 | + last = strlen(parameter); |
64 | for (i=0; i < last; ++i) |
65 | if (strchr("\\&#$^*?(){}<>\"';`|", parameter[i]) != 0 |
66 | || isspace(UCH(parameter[i]))) |
67 | Index: WWW/Library/Implementation/HTUtils.h |
68 | --- 2.8.5rel.1/WWW/Library/Implementation/HTUtils.h Wed Feb 4 04:07:09 2004 |
69 | +++ 2.8.5rel.2/WWW/Library/Implementation/HTUtils.h Thu Apr 22 16:08:10 2004 |
70 | @@ -571,6 +571,10 @@ |
71 | #define TRACE_CFG (TRACE_bit(3)) |
72 | #define TRACE_BSTRING (TRACE_bit(4)) |
73 | |
74 | +#if defined(USE_VERTRACE) && !defined(LY_TRACELINE) |
75 | +#define LY_TRACELINE __LINE__ |
76 | +#endif |
77 | + |
78 | #if defined(LY_TRACELINE) |
79 | #define LY_SHOWWHERE fprintf( tfp, "%s: %d: ", __FILE__, LY_TRACELINE ), |
80 | #else |
81 | Index: configure |
82 | --- 2.8.5rel.1/configure Wed Feb 4 04:07:09 2004 |
83 | +++ 2.8.5rel.2/configure Wed Feb 4 04:07:09 2004 |
84 | @@ -723,7 +723,7 @@ |
85 | |
86 | PACKAGE=lynx |
87 | # $Format: "VERSION=$ProjectVersion$"$ |
88 | -VERSION=2.8.5rel.1 |
89 | +VERSION=2.8.5rel.2 |
90 | |
91 | |
92 | |
93 | Index: configure.in |
94 | --- 2.8.5rel.1/configure.in Wed Feb 4 04:07:09 2004 |
95 | +++ 2.8.5rel.2/configure.in Wed Feb 4 04:07:09 2004 |
96 | @@ -5,7 +5,7 @@ |
97 | dnl |
98 | dnl ask PRCS to plug-in the project-version for the configure-script. |
99 | dnl $Format: "AC_REVISION($ProjectVersion$)"$ |
100 | -AC_REVISION(2.8.5rel.1) |
101 | +AC_REVISION(2.8.5rel.2) |
102 | |
103 | # Save the original $CFLAGS so we can distinguish whether the user set those |
104 | # in the environment, or whether autoconf added -O and -g options: |
105 | @@ -33,7 +33,7 @@ |
106 | PACKAGE=lynx |
107 | dnl ask PRCS to plug-in the project-version for the packages. |
108 | # $Format: "VERSION=$ProjectVersion$"$ |
109 | -VERSION=2.8.5rel.1 |
110 | +VERSION=2.8.5rel.2 |
111 | AC_SUBST(PACKAGE) |
112 | AC_SUBST(VERSION) |
113 | AC_SUBST(DESTDIR) |
114 | Index: lynx.cfg |
115 | --- 2.8.5rel.1/lynx.cfg Wed Jan 28 11:30:38 2004 |
116 | +++ 2.8.5rel.2/lynx.cfg Wed Jan 28 11:30:38 2004 |
117 | @@ -3,10 +3,10 @@ |
118 | # or Lynx_Dir:lynx.cfg (VMS) |
119 | # |
120 | # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ |
121 | -#PRCS LYNX_VERSION "2.8.5rel.1" |
122 | +#PRCS LYNX_VERSION "2.8.5rel.2" |
123 | # |
124 | # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ |
125 | -#PRCS LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800" |
126 | +#PRCS LYNX_DATE "Thu, 22 Apr 2004 16:08:10 -0700" |
127 | # |
128 | # Definition pairs are of the form VARIABLE:DEFINITION |
129 | # NO spaces are allowed between the pair items. |
130 | Index: src/HTAlert.c |
131 | --- 2.8.5rel.1/src/HTAlert.c Sat Jan 24 17:51:04 2004 |
132 | +++ 2.8.5rel.2/src/HTAlert.c Thu Apr 22 16:08:10 2004 |
133 | @@ -165,13 +165,16 @@ |
134 | static long kb_units = 1024; |
135 | CONST char *u = HTProgressUnits(LYTransferRate); |
136 | |
137 | - if ( (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) |
138 | - && (n >= 10 * kb_units) ) |
139 | - sprintf(s, "%ld", n/kb_units); |
140 | - else if ((LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) |
141 | - && (n > 999)) /* Avoid switching between 1016b/s and 1K/s */ |
142 | - sprintf(s, "%.2g", ((double)n)/kb_units); |
143 | - else { |
144 | + if (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) { |
145 | + if (n >= 10 * kb_units) { |
146 | + sprintf(s, "%ld", n/kb_units); |
147 | + } else if (n > 999) { /* Avoid switching between 1016b/s and 1K/s */ |
148 | + sprintf(s, "%.2g", ((double)n)/kb_units); |
149 | + } else { |
150 | + sprintf(s, "%ld", n); |
151 | + u = HTProgressUnits(rateBYTES); |
152 | + } |
153 | + } else { |
154 | sprintf(s, "%ld", n); |
155 | } |
156 | |
157 | Index: src/LYKeymap.c |
158 | --- 2.8.5rel.1/src/LYKeymap.c Sun Jun 1 18:16:28 2003 |
159 | +++ 2.8.5rel.2/src/LYKeymap.c Thu Apr 22 16:08:10 2004 |
160 | @@ -1075,8 +1075,11 @@ |
161 | unsigned j; |
162 | myList = HTList_new(); |
163 | for (j = 0; revmap[j].name != 0; j++) { |
164 | - if (revmap[j].doc != 0) |
165 | - HTList_addObject(myList, (char *)revmap[j].name); |
166 | + if (revmap[j].doc != 0) { |
167 | + char *data = NULL; |
168 | + StrAllocCopy(data, revmap[j].name); |
169 | + HTList_addObject(myList, data); |
170 | + } |
171 | } |
172 | } |
173 | return myList; |
174 | Index: userdefs.h |
175 | --- 2.8.5rel.1/userdefs.h Mon Feb 2 12:02:28 2004 |
176 | +++ 2.8.5rel.2/userdefs.h Mon Feb 2 12:02:28 2004 |
177 | @@ -1360,11 +1360,11 @@ |
178 | * the version definition with the Project Version on checkout. Just |
179 | * ignore it. - kw */ |
180 | /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ |
181 | -#define LYNX_VERSION "2.8.5rel.1" |
182 | +#define LYNX_VERSION "2.8.5rel.2" |
183 | #define LYNX_WWW_HOME "http://lynx.isc.org/" |
184 | #define LYNX_WWW_DIST "http://lynx.isc.org/current/" |
185 | /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ |
186 | -#define LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800" |
187 | +#define LYNX_DATE "Thu, 22 Apr 2004 16:08:10 -0700" |
188 | #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ |
189 | #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |
190 |