From 6b4a85888e351e8ad6c55770fff98e0eddf22cd2 Mon Sep 17 00:00:00 2001 From: hniksic Date: Wed, 12 Apr 2000 06:23:35 -0700 Subject: [PATCH] [svn] Commit several fixes. --- po/hr.gmo | Bin 18542 -> 18542 bytes src/ChangeLog | 6 ++++++ src/cmpt.c | 8 ++++---- src/ftp.c | 8 ++++---- src/headers.c | 2 +- src/http.c | 1 - src/main.c | 4 ++++ src/recur.c | 8 ++++---- src/wget.h | 2 +- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/po/hr.gmo b/po/hr.gmo index adc85d9749ff974590734bee88b3c41d60862138..c468f994cdc13157b547bbb7f0eb3fa42e8296b9 100644 GIT binary patch delta 2658 zcmXZceN5F=9LMqRy%NvC1w`~JZ~+x6Bt!`C0*;8l@vyPNr3u;7?y{`aa%&BDtzj&( zWN67B^@q5IJCHybG&Fm7^B=W=G7%s-6*o$Ye3^$~hwcwk$3@32~{)a#TEHxXwU~$9sD*CFG<*;5#Dl2!e!`{b zqf;(N1<-=|7{P_uk2%b5`zfrU;W%nSf4Vx%N^lXjVG%}96Az#k`Uz^_39Q1aSc>_C zTY(Q?2w%r~{17$n@0f*2^H~V9Y!4&jW3!!!kmr_VO@luP0HF z#_;kgEJ7`GBWj#}ya(UMV>pG{`@O7InLUOY_xuv_&ndKN8kFKxddsi|^}usj?>Fl~ z4z`UGK3TH~RQ(DnqB&FsV?y2nim{w}6Y6aAU_2f{E|86*#y=UQpoq>P2i|;n-nB`? zDKe0an(!Z%uZaSLtpW293Ikw*I^^Rftv68Qu1F*;cptWHip z1=TvcP~&aG5bj4kcLH^WW}Qi^qTZesabgnaD93cHLtU>9RB9uxzSB938gLBn#mlJ3 zml0+NTT!Xrf|_s_>cjRi&c_q3J{hH;)Bh)G;^YdxTt1>fZN)l1V;bm1)IjfGH~piS zOg){CfzCiK>buaukIqaF*5CnD2B%Ta1**LdT{(_Xk3LEvL?O7^OKli6a5pNVr=5ey zKRe2g`mf`ppAS~pi|hjXs4cjLshGh>KoJ+978FJW5J7EuFV^e+AE%(y$E@+TA_X-; z5DC%>F$KF(*JlgHF!4*cfciE@QReobwqgWzEoU%;QD2GLs%lhZ4XD(%yY?rVM{5&%=J`3EW4C|4 F`ajp}5s3f* delta 2658 zcmXZdS!i5U7y#gtSgXd`#5l<`ZPHGf#7WH3B$KvjY7>&lR$M?_aNng^Hxvbt%2a6; z_fppfeXt^R#ifd^prDAL;*R@@%Y#)5YKthMet$Bh<-7OXGw1xvxwm_^RP5POQM!9h z?bm7c&o(rsw0{@BNvZ0{+2N|4T;zTiH}NC(r!@am9>v?(#?RQz|9Egp)vjk;#lzfB zlrfnHXx+npVK$}A!S;_xGA#!D%S6d-m^qtGyoNQrkJ^%Xv^@SXl{~X| zcD!yOWmz{x>(pIJ0oH9T`z)UN8KNGF>!>1!_+Oy6ALTW0Bsb6?~X4@=Iz<uj&RS`J zQygUc{y;v@D#kkV^gs883mN62r#5e{px39_q7|ZU7Hw>}^lut#(Z^V@B@UVKmea~! zPS09yWFzmRcDBTZdfgJ0ZsreMshD#)PybtoUE~xhhE{)Jj&PRCX51#-kQyp?e#1loBj{kHRFdM!Jn zasuew$12AxN9%X>#QR_CA|j4~qsqocdG}|rlhIR|bnT!Gx;~^}yZ2)Y|d+fJ&9T#(Y_W81P z>~$Xj#`sRkc-bfA=l^o0DV{~Zy(e*kx6ppQrT1Ovckf@+n?93cp}sTd!_>EdO4oO1 zdHiKMBYlyH48^1m)Sd{q-&!-q@2%H=EpvQ`G4C}xL;ZVZEfw@LdRmAxpaq3E0~Rg} zQ?`ZUs8of>H173z#%;7qp8#bm(Yd-cQDH*m|+Bx)&GI`k~#eY zztP6a=Q&)yT+3w>tymEyv(SnwX`vPOcz!11ESNj!H*p3AW4?1RSfn#E7?nGck5B~% zf24V(CZ<>z~S83n((!oAGa zd_h61`GeIy0nrlU!#0h8hGSg`3`ZrkX?PP$qb^=`q4Xnjs1+kVE)l>;1f&up4oZA* zMj{}u&xn#%nmcl}`+EPgMvqlt^e$?}=yrN7M|U%4XfCyGEY>l9%;pi;*a`9e$AgOv z=-b%!EHFwYfUz&RfIm?%#Y)Pis4X$CDEJ7hcon-C8OgjD--Eb+g#s?dVN;FbKRntC z6)kYC#?OfNU!>zt8OZQ0>eKkQw7|scRI-Ubs1=j(!v?OT>&ZBr=1rbU>rBQW6WrwE zY~~y6=g;g;X=*W@ktspM^Qq0TK&Oi+nKxkSLoQ`RdSFV^ai~Ji;!8N)N3EJ(MVU<( Yse;qTmdDReJBF$@?6+grA + + * http.c (gethttp): Don't free REQUEST -- it was allocated with + alloca(). + Pointed out by Gisle Vanem . + 2000-04-04 Dan Harkless * host.c (store_hostaddress): R. K. Owen's patch introduces a diff --git a/src/cmpt.c b/src/cmpt.c index b193ae3b..439828ca 100644 --- a/src/cmpt.c +++ b/src/cmpt.c @@ -67,8 +67,8 @@ strcasecmp (const char *s1, const char *s2) do { - c1 = tolower (*p1++); - c2 = tolower (*p2++); + c1 = TOLOWER (*p1++); + c2 = TOLOWER (*p2++); if (c1 == '\0') break; } @@ -96,8 +96,8 @@ strncasecmp (const char *s1, const char *s2, size_t n) do { - c1 = tolower (*p1++); - c2 = tolower (*p2++); + c1 = TOLOWER (*p1++); + c2 = TOLOWER (*p2++); if (c1 == '\0' || c1 != c2) return c1 - c2; } while (--n > 0); diff --git a/src/ftp.c b/src/ftp.c index a5473916..9a7f33d8 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -90,7 +90,7 @@ ftp_expected_bytes (const char *s) ++s; if (!*s) return 0; - if (tolower (*s) != 'b') + if (TOLOWER (*s) != 'b') continue; if (strncasecmp (s, "byte", 4)) continue; @@ -243,8 +243,8 @@ Error in server response, closing control connection.\n")); } /* Third: Set type to Image (binary). */ if (!opt.server_response) - logprintf (LOG_VERBOSE, "==> TYPE %c ... ", toupper (u->ftp_type)); - err = ftp_type (&con->rbuf, toupper (u->ftp_type)); + logprintf (LOG_VERBOSE, "==> TYPE %c ... ", TOUPPER (u->ftp_type)); + err = ftp_type (&con->rbuf, TOUPPER (u->ftp_type)); /* FTPRERR, WRITEFAILED, FTPUNKNOWNTYPE */ switch (err) { @@ -268,7 +268,7 @@ Error in server response, closing control connection.\n")); logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, _("Unknown type `%c', closing control connection.\n"), - toupper (u->ftp_type)); + TOUPPER (u->ftp_type)); CLOSE (csock); rbuf_uninitialize (&con->rbuf); return err; diff --git a/src/headers.c b/src/headers.c index bf279552..6b1a670f 100644 --- a/src/headers.c +++ b/src/headers.c @@ -128,7 +128,7 @@ header_process (const char *header, const char *name, void *arg) { /* Check whether HEADER matches NAME. */ - while (*name && (tolower (*name) == tolower (*header))) + while (*name && (TOLOWER (*name) == TOLOWER (*header))) ++name, ++header; if (*name || *header++ != ':') return 0; diff --git a/src/http.c b/src/http.c index effd0c97..fde316bf 100644 --- a/src/http.c +++ b/src/http.c @@ -505,7 +505,6 @@ Accept: %s\r\n\ if (num_written < 0) { logputs (LOG_VERBOSE, _("Failed writing HTTP request.\n")); - free (request); CLOSE (sock); return WRITEFAILED; } diff --git a/src/main.c b/src/main.c index cb724787..2d1276b8 100644 --- a/src/main.c +++ b/src/main.c @@ -87,7 +87,11 @@ i18n_initialize (void) things up. For example, when in a foreign locale, Solaris strptime() fails to handle international dates correctly, which makes http_atotm() malfunction. */ +#ifdef LC_MESSAGES setlocale (LC_MESSAGES, ""); +#else + setlocale (LC_ALL, ""); +#endif /* Set the text message domain. */ bindtextdomain ("wget", LOCALEDIR); textdomain ("wget"); diff --git a/src/recur.c b/src/recur.c index 078f7d85..397db8c6 100644 --- a/src/recur.c +++ b/src/recur.c @@ -335,7 +335,7 @@ recursive_retrieve (const char *file, const char *this_url) char *p; /* Just lowercase the hostname. */ for (p = u->host; *p; p++) - *p = tolower (*p); + *p = TOLOWER (*p); free (u->url); u->url = str_url (u, 0); } @@ -655,9 +655,9 @@ parse_robots (const char *robots_filename) sprintf (version, "Wget/%s", version_string); } for (p = version; *p; p++) - *p = tolower (*p); + *p = TOLOWER (*p); for (p = base_version; *p && *p != '/'; p++) - *p = tolower (*p); + *p = TOLOWER (*p); *p = '\0'; /* Setting this to 1 means that Wget considers itself under @@ -729,7 +729,7 @@ parse_robots (const char *robots_filename) int match = 0; /* Lowercase the agent string. */ for (p = str; *p; p++) - *p = tolower (*p); + *p = TOLOWER (*p); /* If the string is `*', it matches. */ if (*str == '*' && !*(str + 1)) match = 1; diff --git a/src/wget.h b/src/wget.h index 1a1fdb45..d42cb5ae 100644 --- a/src/wget.h +++ b/src/wget.h @@ -113,7 +113,7 @@ char *xstrdup PARAMS ((const char *)); /* ASCII char -> HEX digit */ #define ASC2HEXD(x) (((x) >= '0' && (x) <= '9') ? \ - ((x) - '0') : (toupper(x) - 'A' + 10)) + ((x) - '0') : (TOUPPER(x) - 'A' + 10)) /* HEX digit -> ASCII char */ #define HEXD2ASC(x) (((x) < 10) ? ((x) + '0') : ((x) - 10 + 'A')) -- 2.39.2