?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Initial revision
[libcurl.git] / curl_631_general.patch
blob5bff97b62b8e803bfd06a65ddf4f3499439c313b
1 Only in curl-6.3.1: config-win32.h
2 Only in curl-6.3.1: config-win32.h~
3 Only in curl-6.3.1: config.cache
4 Only in curl-6.3.1: config.h
5 diff -cr curl-6.3.1-org/config.h.in curl-6.3.1/config.h.in
6 *** curl-6.3.1-org/config.h.in Sun Oct 17 13:18:34 1999
7 --- curl-6.3.1/config.h.in Thu Dec 9 14:23:01 1999
8 ***************
9 *** 37,42 ****
10 --- 37,45 ----
11 /* The number of bytes in a long long. */
12 #undef SIZEOF_LONG_LONG
13
14 + /* Define if you have the closesocket function. */
15 + #undef HAVE_CLOSESOCKET
16 +
17 /* Define if you have the gethostbyaddr function. */
18 #undef HAVE_GETHOSTBYADDR
19
20 ***************
21 *** 109,114 ****
22 --- 112,120 ----
23 /* Define if you have the <getopt.h> header file. */
24 #undef HAVE_GETOPT_H
25
26 + /* Define if you have the <io.h> header file. */
27 + #undef HAVE_IO_H
28 +
29 /* Define if you have the <netdb.h> header file. */
30 #undef HAVE_NETDB_H
31
32 ***************
33 *** 169,177 ****
34 --- 175,189 ----
35 /* Define if you have the <termios.h> header file. */
36 #undef HAVE_TERMIOS_H
37
38 + /* Define if you have the <time.h> header file. */
39 + #undef HAVE_TIME_H
40 +
41 /* Define if you have the <unistd.h> header file. */
42 #undef HAVE_UNISTD_H
43
44 + /* Define if you have the <winsock.h> header file. */
45 + #undef HAVE_WINSOCK_H
46 +
47 /* Define if you have the <x509.h> header file. */
48 #undef HAVE_X509_H
49
50 Only in curl-6.3.1: config.log
51 Only in curl-6.3.1: config.status
52 Only in curl-6.3.1: configure
53 diff -cr curl-6.3.1-org/configure.in curl-6.3.1/configure.in
54 *** curl-6.3.1-org/configure.in Wed Nov 24 14:48:38 1999
55 --- curl-6.3.1/configure.in Thu Dec 9 14:34:36 1999
56 ***************
57 *** 1,7 ****
58 dnl $Id: curl_631_general.patch,v 1.1 1999-12-29 14:21:14 bagder Exp $
59 dnl Process this file with autoconf to produce a configure script.
60 AC_INIT(lib/urldata.h)
61 ! AM_CONFIG_HEADER(config.h)
62 AM_INIT_AUTOMAKE(curl,"6.3.1")
63
64 dnl Checks for programs.
65 --- 1,7 ----
66 dnl $Id: curl_631_general.patch,v 1.1 1999-12-29 14:21:14 bagder Exp $
67 dnl Process this file with autoconf to produce a configure script.
68 AC_INIT(lib/urldata.h)
69 ! AM_CONFIG_HEADER(config.h src/config.h)
70 AM_INIT_AUTOMAKE(curl,"6.3.1")
71
72 dnl Checks for programs.
73 ***************
74 *** 133,139 ****
75 sgtty.h \
76 fcntl.h \
77 dlfcn.h \
78 ! alloca.h )
79
80
81 dnl Check for libz header
82 --- 133,143 ----
83 sgtty.h \
84 fcntl.h \
85 dlfcn.h \
86 ! alloca.h \
87 ! winsock.h \
88 ! time.h \
89 ! io.h
90 ! )
91
92
93 dnl Check for libz header
94 ***************
95 *** 175,181 ****
96 tcsetattr \
97 tcgetattr \
98 perror \
99 ! getpass )
100
101
102
103 --- 179,187 ----
104 tcsetattr \
105 tcgetattr \
106 perror \
107 ! getpass \
108 ! closesocket
109 ! )
110
111
112
113 Only in curl-6.3.1: configure.in~
114 Common subdirectories: curl-6.3.1-org/include and curl-6.3.1/include
115 Common subdirectories: curl-6.3.1-org/lib and curl-6.3.1/lib
116 Common subdirectories: curl-6.3.1-org/perl and curl-6.3.1/perl
117 Common subdirectories: curl-6.3.1-org/src and curl-6.3.1/src
118 Only in curl-6.3.1: stamp-h1
119 Common subdirectories: curl-6.3.1-org/include/curl and curl-6.3.1/include/curl
120 diff -cr curl-6.3.1-org/include/curl/curl.h curl-6.3.1/include/curl/curl.h
121 *** curl-6.3.1-org/include/curl/curl.h Wed Nov 24 14:48:37 1999
122 --- curl-6.3.1/include/curl/curl.h Wed Dec 8 15:34:53 1999
123 ***************
124 *** 352,360 ****
125 --- 352,367 ----
126 /* HTTP request, for odd commands like DELETE, TRACE and others */
127 T(HTTPREQUEST, OBJECTPOINT, 35),
128
129 + /* Progress mode sets alternative progress mode displays, the only
130 + one defined today is 1 which makes the #-style progress bar. */
131 + T(PROGRESSMODE, LONG, 36),
132 +
133 URGTAG_LASTENTRY /* the last unusued */
134 } UrgTag;
135
136 + #define CURL_PROGRESS_STATS 0 /* default progress display */
137 + #define CURL_PROGRESS_BAR 1
138 +
139 typedef enum {
140 TIMECOND_NONE,
141
142 Only in curl-6.3.1/include/curl: curl.h~
143 Only in curl-6.3.1-org/include/curl: setup.h
144 Only in curl-6.3.1/include/curl: setup.h~
145 diff -cr curl-6.3.1-org/lib/Makefile curl-6.3.1/lib/Makefile
146 *** curl-6.3.1-org/lib/Makefile Wed Dec 8 13:38:22 1999
147 --- curl-6.3.1/lib/Makefile Thu Dec 9 15:42:21 1999
148 ***************
149 *** 90,98 ****
150
151
152 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
153 ! CPPFLAGS =
154 ! LDFLAGS =
155 ! LIBS = -ldl -lsocket -lnsl
156 libcurl_a_LIBADD =
157 libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \
158 formdata.o upload.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
159 --- 90,98 ----
160
161
162 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
163 ! CPPFLAGS = -I/homes/qradlsg/openssl-0.9.4/include
164 ! LDFLAGS = -L/homes/qradlsg/openssl-0.9.4
165 ! LIBS = -lssl -lcrypto -ldl -lsocket -lnsl
166 libcurl_a_LIBADD =
167 libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \
168 formdata.o upload.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
169 ***************
170 *** 99,105 ****
171 speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
172 escape.o mprintf.o telnet.o getpass.o netrc.o
173 AR = ar
174 ! CFLAGS = -g -O2
175 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
176 CCLD = $(CC)
177 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
178 --- 99,105 ----
179 speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
180 escape.o mprintf.o telnet.o getpass.o netrc.o
181 AR = ar
182 ! CFLAGS = -g -O2 -Wall -pedantic
183 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
184 CCLD = $(CC)
185 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
186 Only in curl-6.3.1/lib: Makefile~
187 diff -cr curl-6.3.1-org/lib/cookie.c curl-6.3.1/lib/cookie.c
188 *** curl-6.3.1-org/lib/cookie.c Fri Nov 12 15:54:59 1999
189 --- curl-6.3.1/lib/cookie.c Thu Dec 9 15:44:37 1999
190 ***************
191 *** 60,66 ****
192 #include <ctype.h>
193
194 #include "cookie.h"
195 ! #include <curl/setup.h>
196 #include "getdate.h"
197
198 /****************************************************************************
199 --- 60,66 ----
200 #include <ctype.h>
201
202 #include "cookie.h"
203 ! #include "setup.h"
204 #include "getdate.h"
205
206 /****************************************************************************
207 ***************
208 *** 134,140 ****
209 }
210 }
211 ptr=strtok(NULL, ";");
212 ! while(ptr && *ptr && isspace(*ptr))
213 ptr++;
214 }
215 }
216 --- 134,140 ----
217 }
218 }
219 ptr=strtok(NULL, ";");
220 ! while(ptr && *ptr && isspace((int)*ptr))
221 ptr++;
222 }
223 }
224 ***************
225 *** 288,294 ****
226 {
227 char line[MAX_COOKIE_LINE];
228 struct CookieInfo *c;
229 - struct Cookie *co;
230 FILE *fp;
231
232 c = (struct CookieInfo *)malloc(sizeof(struct CookieInfo));
233 --- 288,293 ----
234 ***************
235 *** 303,309 ****
236 if(strnequal("Set-Cookie:", line, 11)) {
237 /* This is a cookie line, get it! */
238 char *lineptr=&line[11];
239 ! while(*lineptr && isspace(*lineptr))
240 lineptr++;
241
242 cookie_add(c, TRUE, lineptr);
243 --- 302,308 ----
244 if(strnequal("Set-Cookie:", line, 11)) {
245 /* This is a cookie line, get it! */
246 char *lineptr=&line[11];
247 ! while(*lineptr && isspace((int)*lineptr))
248 lineptr++;
249
250 cookie_add(c, TRUE, lineptr);
251 ***************
252 *** 311,317 ****
253 else {
254 /* This might be a netscape cookie-file line, get it! */
255 char *lineptr=line;
256 ! while(*lineptr && isspace(*lineptr))
257 lineptr++;
258
259 cookie_add(c, FALSE, lineptr);
260 --- 310,316 ----
261 else {
262 /* This might be a netscape cookie-file line, get it! */
263 char *lineptr=line;
264 ! while(*lineptr && isspace((int)*lineptr))
265 lineptr++;
266
267 cookie_add(c, FALSE, lineptr);
268 Only in curl-6.3.1/lib: cookie.c~
269 Binary files curl-6.3.1-org/lib/cookie.o and curl-6.3.1/lib/cookie.o differ
270 diff -cr curl-6.3.1-org/lib/dict.c curl-6.3.1/lib/dict.c
271 *** curl-6.3.1-org/lib/dict.c Thu Oct 14 00:27:12 1999
272 --- curl-6.3.1/lib/dict.c Thu Dec 9 14:27:23 1999
273 ***************
274 *** 49,55 ****
275
276 #include <errno.h>
277
278 ! #include <curl/setup.h>
279
280 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
281 #include <winsock.h>
282 --- 49,55 ----
283
284 #include <errno.h>
285
286 ! #include "setup.h"
287
288 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
289 #include <winsock.h>
290 Binary files curl-6.3.1-org/lib/dict.o and curl-6.3.1/lib/dict.o differ
291 diff -cr curl-6.3.1-org/lib/download.c curl-6.3.1/lib/download.c
292 *** curl-6.3.1-org/lib/download.c Tue Nov 23 09:24:26 1999
293 --- curl-6.3.1/lib/download.c Thu Dec 9 14:27:23 1999
294 ***************
295 *** 42,48 ****
296 #include <stdio.h>
297 #include <string.h>
298
299 ! #include <curl/setup.h>
300
301 #ifdef HAVE_UNISTD_H
302 #include <unistd.h>
303 --- 42,48 ----
304 #include <stdio.h>
305 #include <string.h>
306
307 ! #include "setup.h"
308
309 #ifdef HAVE_UNISTD_H
310 #include <unistd.h>
311 Binary files curl-6.3.1-org/lib/download.o and curl-6.3.1/lib/download.o differ
312 diff -cr curl-6.3.1-org/lib/file.c curl-6.3.1/lib/file.c
313 *** curl-6.3.1-org/lib/file.c Fri Nov 19 08:25:40 1999
314 --- curl-6.3.1/lib/file.c Thu Dec 9 14:27:24 1999
315 ***************
316 *** 49,55 ****
317
318 #include <errno.h>
319
320 ! #include <curl/setup.h>
321
322 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
323 #include <winsock.h>
324 --- 49,55 ----
325
326 #include <errno.h>
327
328 ! #include "setup.h"
329
330 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
331 #include <winsock.h>
332 Binary files curl-6.3.1-org/lib/file.o and curl-6.3.1/lib/file.o differ
333 diff -cr curl-6.3.1-org/lib/formdata.c curl-6.3.1/lib/formdata.c
334 *** curl-6.3.1-org/lib/formdata.c Tue Nov 23 17:54:36 1999
335 --- curl-6.3.1/lib/formdata.c Thu Dec 9 14:27:25 1999
336 ***************
337 *** 56,62 ****
338
339 #include <time.h>
340
341 ! #include <curl/setup.h>
342 #include <curl/curl.h>
343 #include "formdata.h"
344
345 --- 56,62 ----
346
347 #include <time.h>
348
349 ! #include "setup.h"
350 #include <curl/curl.h>
351 #include "formdata.h"
352
353 Binary files curl-6.3.1-org/lib/formdata.o and curl-6.3.1/lib/formdata.o differ
354 diff -cr curl-6.3.1-org/lib/ftp.c curl-6.3.1/lib/ftp.c
355 *** curl-6.3.1-org/lib/ftp.c Tue Nov 23 09:25:06 1999
356 --- curl-6.3.1/lib/ftp.c Thu Dec 9 15:43:10 1999
357 ***************
358 *** 44,50 ****
359 #include <ctype.h>
360 #include <errno.h>
361
362 ! #include <curl/setup.h>
363
364 #ifdef HAVE_UNISTD_H
365 #include <unistd.h>
366 --- 44,50 ----
367 #include <ctype.h>
368 #include <errno.h>
369
370 ! #include "setup.h"
371
372 #ifdef HAVE_UNISTD_H
373 #include <unistd.h>
374 ***************
375 *** 728,734 ****
376 char *ptr2;
377
378 from=strtol(data->range, &ptr, 0);
379 ! while(ptr && *ptr && (isspace(*ptr) || (*ptr=='-')))
380 ptr++;
381 to=strtol(ptr, &ptr2, 0);
382 if(ptr == ptr2) {
383 --- 728,734 ----
384 char *ptr2;
385
386 from=strtol(data->range, &ptr, 0);
387 ! while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))
388 ptr++;
389 to=strtol(ptr, &ptr2, 0);
390 if(ptr == ptr2) {
391 ***************
392 *** 886,892 ****
393 if('(' == *bytes)
394 break;
395 /* if only skip digits, or else we're in deep trouble */
396 ! if(!isdigit(*bytes)) {
397 bytes=NULL;
398 break;
399 }
400 --- 886,892 ----
401 if('(' == *bytes)
402 break;
403 /* if only skip digits, or else we're in deep trouble */
404 ! if(!isdigit((int)*bytes)) {
405 bytes=NULL;
406 break;
407 }
408 Only in curl-6.3.1/lib: ftp.c~
409 Binary files curl-6.3.1-org/lib/ftp.o and curl-6.3.1/lib/ftp.o differ
410 diff -cr curl-6.3.1-org/lib/hostip.c curl-6.3.1/lib/hostip.c
411 *** curl-6.3.1-org/lib/hostip.c Thu Oct 14 00:27:12 1999
412 --- curl-6.3.1/lib/hostip.c Thu Dec 9 14:27:27 1999
413 ***************
414 *** 40,46 ****
415
416 #include <string.h>
417
418 ! #include <curl/setup.h>
419
420 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
421 #include <winsock.h>
422 --- 40,46 ----
423
424 #include <string.h>
425
426 ! #include "setup.h"
427
428 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
429 #include <winsock.h>
430 Binary files curl-6.3.1-org/lib/hostip.o and curl-6.3.1/lib/hostip.o differ
431 diff -cr curl-6.3.1-org/lib/http.c curl-6.3.1/lib/http.c
432 *** curl-6.3.1-org/lib/http.c Sat Oct 30 17:43:52 1999
433 --- curl-6.3.1/lib/http.c Thu Dec 9 14:27:27 1999
434 ***************
435 *** 49,55 ****
436
437 #include <errno.h>
438
439 ! #include <curl/setup.h>
440
441 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
442 #include <winsock.h>
443 --- 49,55 ----
444
445 #include <errno.h>
446
447 ! #include "setup.h"
448
449 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
450 #include <winsock.h>
451 Binary files curl-6.3.1-org/lib/http.o and curl-6.3.1/lib/http.o differ
452 diff -cr curl-6.3.1-org/lib/if2ip.c curl-6.3.1/lib/if2ip.c
453 *** curl-6.3.1-org/lib/if2ip.c Thu Oct 14 00:27:12 1999
454 --- curl-6.3.1/lib/if2ip.c Thu Dec 9 14:27:28 1999
455 ***************
456 *** 42,48 ****
457 #include <stdlib.h>
458 #include <string.h>
459
460 ! #include <curl/setup.h>
461
462 #ifdef HAVE_UNISTD_H
463 #include <unistd.h>
464 --- 42,48 ----
465 #include <stdlib.h>
466 #include <string.h>
467
468 ! #include "setup.h"
469
470 #ifdef HAVE_UNISTD_H
471 #include <unistd.h>
472 diff -cr curl-6.3.1-org/lib/if2ip.h curl-6.3.1/lib/if2ip.h
473 *** curl-6.3.1-org/lib/if2ip.h Thu Oct 14 00:27:12 1999
474 --- curl-6.3.1/lib/if2ip.h Thu Dec 9 14:27:49 1999
475 ***************
476 *** 39,45 ****
477 *
478 * ------------------------------------------------------------
479 ****************************************************************************/
480 ! #include <curl/setup.h>
481
482 #ifndef WIN32
483 char *if2ip(char *interface);
484 --- 39,45 ----
485 *
486 * ------------------------------------------------------------
487 ****************************************************************************/
488 ! #include "setup.h"
489
490 #ifndef WIN32
491 char *if2ip(char *interface);
492 Binary files curl-6.3.1-org/lib/if2ip.o and curl-6.3.1/lib/if2ip.o differ
493 diff -cr curl-6.3.1-org/lib/ldap.c curl-6.3.1/lib/ldap.c
494 *** curl-6.3.1-org/lib/ldap.c Thu Oct 14 00:27:12 1999
495 --- curl-6.3.1/lib/ldap.c Thu Dec 9 15:44:17 1999
496 ***************
497 *** 48,54 ****
498 #include <sys/stat.h>
499 #include <errno.h>
500
501 ! #include <curl/setup.h>
502
503 #if defined(WIN32) && !defined(__GNUC__)
504 #else
505 --- 48,54 ----
506 #include <sys/stat.h>
507 #include <errno.h>
508
509 ! #include "setup.h"
510
511 #if defined(WIN32) && !defined(__GNUC__)
512 #else
513 ***************
514 *** 125,130 ****
515 --- 125,131 ----
516 struct UrlData *data = (struct UrlData *)param;
517
518 printf("%s\n", text);
519 + return 0;
520 }
521
522 /***********************************************************************
523 ***************
524 *** 145,155 ****
525 --- 146,158 ----
526 void *server;
527 void *result;
528 void *entryIterator;
529 + #if 0
530 char *dn;
531 char **attrArray;
532 char *attrIterator;
533 char *attrString;
534 void *dummy;
535 + #endif
536 int ldaptext;
537
538 infof(data, "LDAP: %s %s\n", data->url);
539 Only in curl-6.3.1/lib: ldap.c~
540 Binary files curl-6.3.1-org/lib/ldap.o and curl-6.3.1/lib/ldap.o differ
541 Binary files curl-6.3.1-org/lib/libcurl.a and curl-6.3.1/lib/libcurl.a differ
542 diff -cr curl-6.3.1-org/lib/netrc.c curl-6.3.1/lib/netrc.c
543 *** curl-6.3.1-org/lib/netrc.c Thu Oct 14 00:27:12 1999
544 --- curl-6.3.1/lib/netrc.c Thu Dec 9 14:27:29 1999
545 ***************
546 *** 54,60 ****
547 #include <stdlib.h>
548 #include <string.h>
549
550 ! #include <curl/setup.h>
551 #include "getenv.h"
552
553 /* Debug this single source file with:
554 --- 54,60 ----
555 #include <stdlib.h>
556 #include <string.h>
557
558 ! #include "setup.h"
559 #include "getenv.h"
560
561 /* Debug this single source file with:
562 Binary files curl-6.3.1-org/lib/netrc.o and curl-6.3.1/lib/netrc.o differ
563 diff -cr curl-6.3.1-org/lib/progress.c curl-6.3.1/lib/progress.c
564 *** curl-6.3.1-org/lib/progress.c Thu Oct 14 00:27:12 1999
565 --- curl-6.3.1/lib/progress.c Thu Dec 9 14:27:29 1999
566 ***************
567 *** 39,45 ****
568 ****************************************************************************/
569
570 #include <string.h>
571 ! #include <curl/setup.h>
572
573 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
574 #if defined(__MINGW32__)
575 --- 39,45 ----
576 ****************************************************************************/
577
578 #include <string.h>
579 ! #include "setup.h"
580
581 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
582 #if defined(__MINGW32__)
583 ***************
584 *** 56,77 ****
585 /* --- start of progress routines --- */
586 int progressmax=-1;
587
588 - static int progressmode=0;
589 static int prev = 0;
590 static int width = 0;
591
592 - void ProgressMode(int mode)
593 - {
594 - progressmode=mode;
595 - }
596 -
597 void ProgressInit(struct UrlData *data, int max)
598 {
599 ! static char beenhere=0;
600 !
601 ! if(beenhere || (data->conf&(CONF_NOPROGRESS|CONF_MUTE)))
602 return;
603 ! /*beenhere=1;*/
604 prev = 0;
605
606 /* TODO: get terminal width through ansi escapes or something similar.
607 --- 56,69 ----
608 /* --- start of progress routines --- */
609 int progressmax=-1;
610
611 static int prev = 0;
612 static int width = 0;
613
614 void ProgressInit(struct UrlData *data, int max)
615 {
616 ! if(data->conf&(CONF_NOPROGRESS|CONF_MUTE))
617 return;
618 !
619 prev = 0;
620
621 /* TODO: get terminal width through ansi escapes or something similar.
622 ***************
623 *** 89,95 ****
624 return;
625 }
626
627 ! if ( progressmode == URG_PROGRESS_MODE_STATS )
628 fprintf(stderr, " %% Received Total Speed Time left Total Curr.Speed\n");
629 }
630
631 --- 81,87 ----
632 return;
633 }
634
635 ! if ( data->progressmode == CURL_PROGRESS_STATS )
636 fprintf(stderr, " %% Received Total Speed Time left Total Curr.Speed\n");
637 }
638
639 ***************
640 *** 104,111 ****
641 void ProgressShow(struct UrlData *data,
642 int point, struct timeval start, struct timeval now, bool force)
643 {
644 ! switch ( progressmode ) {
645 ! case URG_PROGRESS_MODE_STATS:
646 {
647 static long lastshow;
648 double percen;
649 --- 96,103 ----
650 void ProgressShow(struct UrlData *data,
651 int point, struct timeval start, struct timeval now, bool force)
652 {
653 ! switch ( data->progressmode ) {
654 ! case CURL_PROGRESS_STATS:
655 {
656 static long lastshow;
657 double percen;
658 ***************
659 *** 172,178 ****
660 lastshow = now.tv_sec;
661 break;
662 }
663 ! case URG_PROGRESS_MODE_BAR: /* 19990617 larsa */
664 {
665 if (point == prev) break;
666 if (progressmax == -1) {
667 --- 164,170 ----
668 lastshow = now.tv_sec;
669 break;
670 }
671 ! case CURL_PROGRESS_BAR: /* 19990617 larsa */
672 {
673 if (point == prev) break;
674 if (progressmax == -1) {
675 Only in curl-6.3.1/lib: progress.c~
676 diff -cr curl-6.3.1-org/lib/progress.h curl-6.3.1/lib/progress.h
677 *** curl-6.3.1-org/lib/progress.h Mon Sep 6 08:59:41 1999
678 --- curl-6.3.1/lib/progress.h Thu Dec 9 14:27:50 1999
679 ***************
680 *** 51,58 ****
681 /* Don't show progress for sizes smaller than: */
682 #define LEAST_SIZE_PROGRESS BUFSIZE
683
684 - /* we want more progress info modes... */
685 - #define URG_PROGRESS_MODE_STATS (0) /* default is the mode with value 0 */
686 - #define URG_PROGRESS_MODE_BAR (1)
687 -
688 #endif /* __PROGRESS_H */
689 --- 51,54 ----
690 Only in curl-6.3.1/lib: progress.h~
691 Binary files curl-6.3.1-org/lib/progress.o and curl-6.3.1/lib/progress.o differ
692 Only in curl-6.3.1/lib: replace.sh
693 Only in curl-6.3.1/lib: replace.sh~
694 diff -cr curl-6.3.1-org/lib/sendf.c curl-6.3.1/lib/sendf.c
695 *** curl-6.3.1-org/lib/sendf.c Thu Oct 14 00:27:12 1999
696 --- curl-6.3.1/lib/sendf.c Thu Dec 9 14:27:30 1999
697 ***************
698 *** 42,48 ****
699 #include <stdarg.h>
700 #include <stdlib.h>
701
702 ! #include <curl/setup.h>
703
704 #ifdef HAVE_UNISTD_H
705 #include <unistd.h>
706 --- 42,48 ----
707 #include <stdarg.h>
708 #include <stdlib.h>
709
710 ! #include "setup.h"
711
712 #ifdef HAVE_UNISTD_H
713 #include <unistd.h>
714 Binary files curl-6.3.1-org/lib/sendf.o and curl-6.3.1/lib/sendf.o differ
715 Only in curl-6.3.1/lib: setup.h
716 Only in curl-6.3.1/lib: setup.h~
717 diff -cr curl-6.3.1-org/lib/speedcheck.h curl-6.3.1/lib/speedcheck.h
718 *** curl-6.3.1-org/lib/speedcheck.h Thu Oct 14 00:27:12 1999
719 --- curl-6.3.1/lib/speedcheck.h Thu Dec 9 14:27:50 1999
720 ***************
721 *** 40,46 ****
722 * ------------------------------------------------------------
723 ****************************************************************************/
724
725 ! #include <curl/setup.h>
726
727 #include "timeval.h"
728
729 --- 40,46 ----
730 * ------------------------------------------------------------
731 ****************************************************************************/
732
733 ! #include "setup.h"
734
735 #include "timeval.h"
736
737 Binary files curl-6.3.1-org/lib/speedcheck.o and curl-6.3.1/lib/speedcheck.o differ
738 diff -cr curl-6.3.1-org/lib/ssluse.c curl-6.3.1/lib/ssluse.c
739 *** curl-6.3.1-org/lib/ssluse.c Mon Sep 6 08:59:41 1999
740 --- curl-6.3.1/lib/ssluse.c Thu Dec 9 14:27:30 1999
741 ***************
742 *** 133,138 ****
743 --- 133,152 ----
744
745 #endif
746
747 + #if SSL_VERIFY_CERT
748 + int cert_verify_callback(int ok, X509_STORE_CTX *ctx)
749 + {
750 + X509 *err_cert;
751 + char buf[256];
752 +
753 + err_cert=X509_STORE_CTX_get_current_cert(ctx);
754 + X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
755 +
756 + return 1;
757 + }
758 +
759 + #endif
760 +
761 /* ====================================================== */
762 int
763 UrgSSLConnect (struct UrlData *data)
764 ***************
765 *** 176,182 ****
766 return 2;
767 }
768 }
769 ! /* Lets make a SSL structure */
770 data->ssl = SSL_new (data->ctx);
771 SSL_set_connect_state (data->ssl);
772
773 --- 190,204 ----
774 return 2;
775 }
776 }
777 !
778 ! #if SSL_VERIFY_CERT
779 ! SSL_CTX_set_verify(data->ctx,
780 ! SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT|
781 ! SSL_VERIFY_CLIENT_ONCE,
782 ! cert_verify_callback);
783 ! #endif
784 !
785 ! /* Lets make an SSL structure */
786 data->ssl = SSL_new (data->ctx);
787 SSL_set_connect_state (data->ssl);
788
789 ***************
790 *** 227,232 ****
791 --- 249,261 ----
792 /* We could do all sorts of certificate verification stuff here before
793 deallocating the certificate. */
794
795 +
796 + #if SSL_VERIFY_CERT
797 + infof(data, "Verify result: %d\n", SSL_get_verify_result(data->ssl));
798 + #endif
799 +
800 +
801 +
802 X509_free (data->server_cert);
803 #else /* USE_SSLEAY */
804 /* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */
805 Only in curl-6.3.1/lib: ssluse.c~
806 Binary files curl-6.3.1-org/lib/ssluse.o and curl-6.3.1/lib/ssluse.o differ
807 diff -cr curl-6.3.1-org/lib/telnet.c curl-6.3.1/lib/telnet.c
808 *** curl-6.3.1-org/lib/telnet.c Thu Oct 14 00:27:12 1999
809 --- curl-6.3.1/lib/telnet.c Thu Dec 9 14:27:31 1999
810 ***************
811 *** 57,63 ****
812
813 #include <errno.h>
814
815 ! #include <curl/setup.h>
816
817 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
818 #include <winsock.h>
819 --- 57,63 ----
820
821 #include <errno.h>
822
823 ! #include "setup.h"
824
825 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
826 #include <winsock.h>
827 Binary files curl-6.3.1-org/lib/telnet.o and curl-6.3.1/lib/telnet.o differ
828 diff -cr curl-6.3.1-org/lib/timeval.h curl-6.3.1/lib/timeval.h
829 *** curl-6.3.1-org/lib/timeval.h Thu Oct 14 00:27:12 1999
830 --- curl-6.3.1/lib/timeval.h Thu Dec 9 14:27:51 1999
831 ***************
832 *** 46,52 ****
833 #include <sys/time.h>
834 #endif
835
836 ! #include <curl/setup.h>
837
838 #ifndef HAVE_GETTIMEOFDAY
839 #if !defined(_WINSOCKAPI_) && !defined(__MINGW32__)
840 --- 46,52 ----
841 #include <sys/time.h>
842 #endif
843
844 ! #include "setup.h"
845
846 #ifndef HAVE_GETTIMEOFDAY
847 #if !defined(_WINSOCKAPI_) && !defined(__MINGW32__)
848 Binary files curl-6.3.1-org/lib/timeval.o and curl-6.3.1/lib/timeval.o differ
849 diff -cr curl-6.3.1-org/lib/upload.c curl-6.3.1/lib/upload.c
850 *** curl-6.3.1-org/lib/upload.c Thu Oct 14 00:27:12 1999
851 --- curl-6.3.1/lib/upload.c Thu Dec 9 14:27:32 1999
852 ***************
853 *** 38,44 ****
854 * ------------------------------------------------------------
855 ****************************************************************************/
856
857 ! #include <curl/setup.h>
858 #ifdef HAVE_UNISTD_H
859 #include <unistd.h>
860 #endif
861 --- 38,44 ----
862 * ------------------------------------------------------------
863 ****************************************************************************/
864
865 ! #include "setup.h"
866 #ifdef HAVE_UNISTD_H
867 #include <unistd.h>
868 #endif
869 Binary files curl-6.3.1-org/lib/upload.o and curl-6.3.1/lib/upload.o differ
870 diff -cr curl-6.3.1-org/lib/url.c curl-6.3.1/lib/url.c
871 *** curl-6.3.1-org/lib/url.c Fri Nov 19 08:07:10 1999
872 --- curl-6.3.1/lib/url.c Thu Dec 9 14:27:32 1999
873 ***************
874 *** 54,60 ****
875
876 #include <errno.h>
877
878 ! #include <curl/setup.h>
879
880 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
881 #include <winsock.h>
882 --- 54,60 ----
883
884 #include <errno.h>
885
886 ! #include "setup.h"
887
888 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
889 #include <winsock.h>
890 ***************
891 *** 387,392 ****
892 --- 387,395 ----
893 case URGTAG_POSTFIELDS:
894 data->postfields = (char *)param_obj;
895 break;
896 + case URGTAG_PROGRESSMODE:
897 + data->progressmode = (long)param_long;
898 + break;
899 case URGTAG_REFERER:
900 data->referer = (char *)param_obj;
901 break;
902 Only in curl-6.3.1/lib: url.c~
903 Binary files curl-6.3.1-org/lib/url.o and curl-6.3.1/lib/url.o differ
904 diff -cr curl-6.3.1-org/lib/urldata.h curl-6.3.1/lib/urldata.h
905 *** curl-6.3.1-org/lib/urldata.h Sat Oct 30 17:44:42 1999
906 --- curl-6.3.1/lib/urldata.h Thu Dec 9 14:27:52 1999
907 ***************
908 *** 42,48 ****
909
910 /* This file is for lib internal stuff */
911
912 ! #include <curl/setup.h>
913
914 #ifndef MAXHOSTNAMELEN
915 #define MAXHOSTNAMELEN 256
916 --- 42,48 ----
917
918 /* This file is for lib internal stuff */
919
920 ! #include "setup.h"
921
922 #ifndef MAXHOSTNAMELEN
923 #define MAXHOSTNAMELEN 256
924 ***************
925 *** 184,189 ****
926 --- 184,190 ----
927
928 char *headerbuff; /* allocated buffer to store headers in */
929 int headersize; /* size of the allocation */
930 + int progressmode; /* what kind of progress meter to display */
931
932 #define MAX_CURL_USER_LENGTH 128
933 #define MAX_CURL_PASSWORD_LENGTH 128
934 Only in curl-6.3.1/lib: urldata.h~
935 diff -cr curl-6.3.1-org/lib/version.c curl-6.3.1/lib/version.c
936 *** curl-6.3.1-org/lib/version.c Thu Oct 14 00:27:12 1999
937 --- curl-6.3.1/lib/version.c Thu Dec 9 14:27:32 1999
938 ***************
939 *** 41,47 ****
940 #include <string.h>
941 #include <stdio.h>
942
943 ! #include <curl/setup.h>
944 #include <curl/curl.h>
945 #include "urldata.h"
946
947 --- 41,47 ----
948 #include <string.h>
949 #include <stdio.h>
950
951 ! #include "setup.h"
952 #include <curl/curl.h>
953 #include "urldata.h"
954
955 Binary files curl-6.3.1-org/lib/version.o and curl-6.3.1/lib/version.o differ
956 diff -cr curl-6.3.1-org/src/Makefile curl-6.3.1/src/Makefile
957 *** curl-6.3.1-org/src/Makefile Wed Dec 8 13:39:41 1999
958 --- curl-6.3.1/src/Makefile Thu Dec 9 14:47:51 1999
959 ***************
960 *** 97,107 ****
961
962
963 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
964 ! LDFLAGS =
965 ! LIBS = -ldl -lsocket -lnsl
966 curl_OBJECTS = main.o hugehelp.o urlglob.o
967 curl_LDFLAGS =
968 ! CFLAGS = -g -O2
969 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
970 CCLD = $(CC)
971 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
972 --- 97,107 ----
973
974
975 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
976 ! LDFLAGS = -L/homes/qradlsg/openssl-0.9.4
977 ! LIBS = -lssl -lcrypto -ldl -lsocket -lnsl
978 curl_OBJECTS = main.o hugehelp.o urlglob.o
979 curl_LDFLAGS =
980 ! CFLAGS = -g -O2 -Wall
981 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
982 CCLD = $(CC)
983 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
984 diff -cr curl-6.3.1-org/src/Makefile.in curl-6.3.1/src/Makefile.in
985 *** curl-6.3.1-org/src/Makefile.in Wed Dec 8 13:38:21 1999
986 --- curl-6.3.1/src/Makefile.in Thu Dec 9 14:40:07 1999
987 ***************
988 *** 101,107 ****
989 LIBS = @LIBS@
990 curl_OBJECTS = main.o hugehelp.o urlglob.o
991 curl_LDFLAGS =
992 ! CFLAGS = @CFLAGS@
993 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
994 CCLD = $(CC)
995 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
996 --- 101,107 ----
997 LIBS = @LIBS@
998 curl_OBJECTS = main.o hugehelp.o urlglob.o
999 curl_LDFLAGS =
1000 ! CFLAGS = @CFLAGS@ -Wall
1001 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
1002 CCLD = $(CC)
1003 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
1004 Only in curl-6.3.1/src: Makefile.in~
1005 Only in curl-6.3.1/src: config-win32.h
1006 Only in curl-6.3.1/src: config-win32.h~
1007 Only in curl-6.3.1/src: config.h
1008 Only in curl-6.3.1/src: config.h.in
1009 Only in curl-6.3.1/src: config.h.in~
1010 Only in curl-6.3.1/src: curl
1011 Only in curl-6.3.1/src: hugehelp.c
1012 Binary files curl-6.3.1-org/src/hugehelp.o and curl-6.3.1/src/hugehelp.o differ
1013 diff -cr curl-6.3.1-org/src/main.c curl-6.3.1/src/main.c
1014 *** curl-6.3.1-org/src/main.c Sat Oct 30 17:45:12 1999
1015 --- curl-6.3.1/src/main.c Thu Dec 9 14:50:12 1999
1016 ***************
1017 *** 45,53 ****
1018 #include <sys/stat.h>
1019 #include <ctype.h>
1020
1021 ! #include "curl/setup.h"
1022 ! #include "curl/curl.h"
1023 ! #include "curl/mprintf.h"
1024 #include "../lib/getdate.h"
1025 #ifdef GLOBURL
1026 #include "urlglob.h"
1027 --- 45,52 ----
1028 #include <sys/stat.h>
1029 #include <ctype.h>
1030
1031 ! #include <curl/curl.h>
1032 ! #include <curl/mprintf.h>
1033 #include "../lib/getdate.h"
1034 #ifdef GLOBURL
1035 #include "urlglob.h"
1036 ***************
1037 *** 54,71 ****
1038 #define CURLseparator "--_curl_--"
1039 #define MIMEseparator "_curl_"
1040 #endif
1041 #include "version.h"
1042
1043 ! #ifdef WIN32
1044 #include <io.h>
1045 ! #else
1046 #ifdef HAVE_UNISTD_H
1047 #include <unistd.h>
1048 #endif
1049 - #endif
1050
1051 extern void hugehelp(void);
1052 - extern void ProgressMode(int);
1053
1054 static void helpf(char *fmt, ...)
1055 {
1056 --- 53,73 ----
1057 #define CURLseparator "--_curl_--"
1058 #define MIMEseparator "_curl_"
1059 #endif
1060 +
1061 + /* This is now designed to have its own local setup.h */
1062 + #include "setup.h"
1063 +
1064 #include "version.h"
1065
1066 ! #ifdef HAVE_IO_H /* typical win32 habit */
1067 #include <io.h>
1068 ! #endif
1069 !
1070 #ifdef HAVE_UNISTD_H
1071 #include <unistd.h>
1072 #endif
1073
1074 extern void hugehelp(void);
1075
1076 static void helpf(char *fmt, ...)
1077 {
1078 ***************
1079 *** 173,178 ****
1080 --- 175,181 ----
1081 bool crlf;
1082 char *cookiefile;
1083 char *httprequest;
1084 + bool progressmode;
1085
1086 FILE *errors; /* if stderr redirect is requested */
1087
1088 ***************
1089 *** 412,419 ****
1090 else
1091 config->errors = stdout;
1092 break;
1093 ! case '#': /* 19990617 larsa */
1094 ! ProgressMode(1);
1095 break;
1096 case '2':
1097 /* SSL version 2 */
1098 --- 415,422 ----
1099 else
1100 config->errors = stdout;
1101 break;
1102 ! case '#': /* added 19990617 larsa */
1103 ! config->progressmode ^= CURL_PROGRESS_BAR;
1104 break;
1105 case '2':
1106 /* SSL version 2 */
1107 ***************
1108 *** 833,839 ****
1109 int infilesize=-1; /* -1 means unknown */
1110 bool stillflags=TRUE;
1111
1112 ! int res;
1113 int i;
1114 struct Configurable config;
1115
1116 --- 836,842 ----
1117 int infilesize=-1; /* -1 means unknown */
1118 bool stillflags=TRUE;
1119
1120 ! int res=URG_OK;
1121 int i;
1122 struct Configurable config;
1123
1124 ***************
1125 *** 937,943 ****
1126 printf("Content-Type: multipart/mixed; boundary=%s\n\n", MIMEseparator);
1127 #endif
1128 }
1129 ! for (i = 0; url = next_url(urls); ++i) {
1130 if (outfiles)
1131 config.outfile = strdup(outfiles);
1132 #endif
1133 --- 940,946 ----
1134 printf("Content-Type: multipart/mixed; boundary=%s\n\n", MIMEseparator);
1135 #endif
1136 }
1137 ! for (i = 0; (url = next_url(urls)); ++i) {
1138 if (outfiles)
1139 config.outfile = strdup(outfiles);
1140 #endif
1141 ***************
1142 *** 1105,1116 ****
1143 URGTAG_CRLF, config.crlf,
1144 URGTAG_QUOTE, config.quote,
1145 URGTAG_WRITEHEADER, headerfilep,
1146 -
1147 URGTAG_COOKIEFILE, config.cookiefile,
1148 URGTAG_SSLVERSION, config.ssl_version,
1149 URGTAG_TIMECONDITION, config.timecond,
1150 URGTAG_TIMEVALUE, config.condtime,
1151 URGTAG_HTTPREQUEST, config.httprequest,
1152 URGTAG_DONE); /* always terminate the list of tags */
1153 if(!config.errors)
1154 config.errors = stderr;
1155 --- 1108,1119 ----
1156 URGTAG_CRLF, config.crlf,
1157 URGTAG_QUOTE, config.quote,
1158 URGTAG_WRITEHEADER, headerfilep,
1159 URGTAG_COOKIEFILE, config.cookiefile,
1160 URGTAG_SSLVERSION, config.ssl_version,
1161 URGTAG_TIMECONDITION, config.timecond,
1162 URGTAG_TIMEVALUE, config.condtime,
1163 URGTAG_HTTPREQUEST, config.httprequest,
1164 + URGTAG_PROGRESSMODE, config.progressmode,
1165 URGTAG_DONE); /* always terminate the list of tags */
1166 if(!config.errors)
1167 config.errors = stderr;
1168 Only in curl-6.3.1/src: main.c~
1169 Binary files curl-6.3.1-org/src/main.o and curl-6.3.1/src/main.o differ
1170 Only in curl-6.3.1/src: setup.h
1171 Only in curl-6.3.1/src: setup.h~
1172 Only in curl-6.3.1/src: stamp-h2
1173 diff -cr curl-6.3.1-org/src/urlglob.c curl-6.3.1/src/urlglob.c
1174 *** curl-6.3.1-org/src/urlglob.c Thu Oct 14 00:28:43 1999
1175 --- curl-6.3.1/src/urlglob.c Wed Dec 8 16:55:55 1999
1176 ***************
1177 *** 41,46 ****
1178 --- 41,47 ----
1179 #include <stdio.h>
1180 #include <stdlib.h>
1181 #include <string.h>
1182 + #include <ctype.h>
1183 #include <curl/curl.h>
1184 #include "urlglob.h"
1185
1186 ***************
1187 *** 117,123 ****
1188 - num range with leading zeros: e.g. "001-999]"
1189 expression is checked for well-formedness and collected until the next ']'
1190 */
1191 - char* buf = glob_buffer;
1192 URLPattern *pat;
1193 char *c;
1194
1195 --- 118,123 ----
1196 ***************
1197 *** 125,131 ****
1198 /* patterns 0,1,2,... correspond to size=1,3,5,... */
1199 ++glob_expand->size;
1200
1201 ! if (isalpha(*pattern)) { /* character range detected */
1202 pat->type = UPTCharRange;
1203 if (sscanf(pattern, "%c-%c]", &pat->content.CharRange.min_c, &pat->content.CharRange.max_c) != 2 ||
1204 pat->content.CharRange.min_c >= pat->content.CharRange.max_c ||
1205 --- 125,131 ----
1206 /* patterns 0,1,2,... correspond to size=1,3,5,... */
1207 ++glob_expand->size;
1208
1209 ! if (isalpha((int)*pattern)) { /* character range detected */
1210 pat->type = UPTCharRange;
1211 if (sscanf(pattern, "%c-%c]", &pat->content.CharRange.min_c, &pat->content.CharRange.max_c) != 2 ||
1212 pat->content.CharRange.min_c >= pat->content.CharRange.max_c ||
1213 ***************
1214 *** 139,145 ****
1215 return (pat->content.CharRange.max_c - pat->content.CharRange.min_c + 1) *
1216 glob_word(pattern + 4, pos + 4);
1217 }
1218 ! if (isdigit(*pattern)) { /* numeric range detected */
1219 pat->type = UPTNumRange;
1220 pat->content.NumRange.padlength = 0;
1221 if (sscanf(pattern, "%d-%d]", &pat->content.NumRange.min_n, &pat->content.NumRange.max_n) != 2 ||
1222 --- 139,145 ----
1223 return (pat->content.CharRange.max_c - pat->content.CharRange.min_c + 1) *
1224 glob_word(pattern + 4, pos + 4);
1225 }
1226 ! if (isdigit((int)*pattern)) { /* numeric range detected */
1227 pat->type = UPTNumRange;
1228 pat->content.NumRange.padlength = 0;
1229 if (sscanf(pattern, "%d-%d]", &pat->content.NumRange.min_n, &pat->content.NumRange.max_n) != 2 ||
1230 ***************
1231 *** 150,156 ****
1232 }
1233 if (*pattern == '0') { /* leading zero specified */
1234 c = pattern;
1235 ! while (isdigit(*c++))
1236 ++pat->content.NumRange.padlength; /* padding length is set for all instances
1237 of this pattern */
1238 }
1239 --- 150,156 ----
1240 }
1241 if (*pattern == '0') { /* leading zero specified */
1242 c = pattern;
1243 ! while (isdigit((int)*c++))
1244 ++pat->content.NumRange.padlength; /* padding length is set for all instances
1245 of this pattern */
1246 }
1247 ***************
1248 *** 296,302 ****
1249
1250 while (*filename != '\0') {
1251 if (*filename == '#') {
1252 ! if (!isdigit(*++filename) ||
1253 *filename == '0') { /* only '#1' ... '#9' allowed */
1254 printf("illegal matching expression\n");
1255 exit(URG_URL_MALFORMAT);
1256 --- 296,302 ----
1257
1258 while (*filename != '\0') {
1259 if (*filename == '#') {
1260 ! if (!isdigit((int)*++filename) ||
1261 *filename == '0') { /* only '#1' ... '#9' allowed */
1262 printf("illegal matching expression\n");
1263 exit(URG_URL_MALFORMAT);
1264 Only in curl-6.3.1/src: urlglob.c~
1265 Binary files curl-6.3.1-org/src/urlglob.o and curl-6.3.1/src/urlglob.o differ
libcurl git mirror