diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/AUTHORS wget-1.5.2/AUTHORS --- wget-1.5.1/AUTHORS Mon Apr 20 01:30:15 1998 +++ wget-1.5.2/AUTHORS Tue May 19 20:00:59 1998 @@ -7,4 +7,5 @@ Darko Budor. Added Windows support, wrote wsstartup.c, wsstartup.h and windecl.h. -Junio Hamano. Added support for Opie and HTTP digests. +Junio Hamano. Added support for FTP Opie and HTTP digest +authentication. diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/ChangeLog wget-1.5.2/ChangeLog --- wget-1.5.1/ChangeLog Fri May 1 18:50:30 1998 +++ wget-1.5.2/ChangeLog Tue Jun 23 23:27:41 1998 @@ -1,3 +1,51 @@ +1998-06-23 Dave Love + + * configure.in (exext): Define. + +1998-06-06 Hrvoje Niksic + + * configure.in: Check for access(). + +1998-05-20 Hrvoje Niksic + + * po/hr.po: Some fixes, as per suggestions by Francois Pinard. + +1998-05-19 Dominique Delamarre + + * po/fr.po: New file. + +1998-05-19 Toomas Soome + + * po/et.po: Updated. + +1998-05-11 Simos KSenitellis + + * po/el.po: New file. + +1998-05-09 Hrvoje Niksic + + * aclocal.m4 (WGET_WITH_NLS): Print available catalogs. + +1998-05-09 Toomas Soome + + * po/et.po: New file. + +1998-05-06 Douglas E. Wegscheid + + * configure.bat: set up for either Borland or Visual C + + * windows/wget.dep: new file + + * windows/Makefile.*: use wget.dep + + * rename windows/Makefile.bor to Makefile.src.bor + +1998-05-06 Douglas E. Wegscheid + + * windows/makefile.bor: Updated. + + * windows/Makefile.src: Ditto. + 1998-04-30 Douglas E. Wegscheid * windows/config.h.bor: New file. diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/INSTALL wget-1.5.2/INSTALL --- wget-1.5.1/INSTALL Mon Apr 20 01:35:55 1998 +++ wget-1.5.2/INSTALL Tue Jun 23 23:56:54 1998 @@ -47,7 +47,8 @@ To configure Wget on Windows, run configure.bat and follow the instructions in the windows/ directory. If this doesn't work for any -reason, talk to ; I do not maintain the port. +reason, talk to the Windows developers listed in `windows/README'; I +do not maintain the port. 2) Compilation diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/MAILING-LIST wget-1.5.2/MAILING-LIST --- wget-1.5.1/MAILING-LIST Tue Mar 17 03:00:28 1998 +++ wget-1.5.2/MAILING-LIST Tue Jun 23 23:55:14 1998 @@ -8,8 +8,9 @@ Denmark, . To subscribe, send mail to . -The list is fairly low-volume (one or two messages per day), although -there are days of high traffic; you are welcome to subscribe -- the -more people on the list, the better! :-) +The list is fairly low-volume -- one or two messages per day and with +sporadic periods of intensive activity. If you are interested in +using or hacking Wget, or wish to read the important announcements, +you are very welcome to subscribe. The list is archived at . diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/NEWS wget-1.5.2/NEWS --- wget-1.5.1/NEWS Fri Apr 24 00:34:27 1998 +++ wget-1.5.2/NEWS Thu May 7 14:59:28 1998 @@ -5,6 +5,8 @@ Please send GNU Wget bug reports to . +* Wget 1.5.2 is a bugfix release with no user-visible changes. + * Wget 1.5.1 is a bugfix release with no user-visible changes. * Changes in Wget 1.5.0 diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/README wget-1.5.2/README --- wget-1.5.1/README Tue May 5 09:11:50 1998 +++ wget-1.5.2/README Thu May 7 14:59:44 1998 @@ -38,8 +38,8 @@ Like all GNU utilities, the latest version of Wget can be found at the master GNU archive site prep.ai.mit.edu, and its mirrors. For -example, Wget 1.5.1 is at: -. +example, Wget 1.5.2 is at: +. The latest version is also available via FTP from the maintainer's machine, at: diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/TODO wget-1.5.2/TODO --- wget-1.5.1/TODO Tue Apr 28 07:06:31 1998 +++ wget-1.5.2/TODO Sat Jun 13 02:46:58 1998 @@ -4,7 +4,16 @@ plan to implement these features; this is just a list of things I'd like to see in Wget. I'll work on some of them myself, and I will accept patches in their direction. The items are not listed in any -particular order. +particular order. Not all of them are user-visible changes. + +* Make `-k' convert too. + +* Add option to clobber existing file names (no `.N' suffixes). + +* Introduce a concept of "boolean" options. For instance, every + boolean option `--foo' would have a `--no-foo' equivalent for + turning it off. Get rid of `--foo=no' stuff. Short options would + be handled as `-x' vs. `-nx'. * Implement "thermometer" display (not all that hard; use an alternative show_progress() if the output goes to a terminal.) @@ -60,6 +69,8 @@ * Implement a concept of "packages" a la mirror. -* Implement more HTTP/1.1 bells and whistles. +* Implement correct RFC1808 URL parsing. + +* Implement more HTTP/1.1 bells and whistles (ETag, Content-MD5 etc.) * Support SSL encryption through SSLeay. diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/aclocal.m4 wget-1.5.2/aclocal.m4 --- wget-1.5.1/aclocal.m4 Sat Apr 4 23:27:13 1998 +++ wget-1.5.2/aclocal.m4 Tue May 12 17:51:09 1998 @@ -103,6 +103,7 @@ dnl last moment. if test x"$HAVE_NLS" = xyes; then + AC_MSG_RESULT("language catalogs: $ALL_LINGUAS") AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/configure wget-1.5.2/configure --- wget-1.5.1/configure Mon Apr 27 21:31:50 1998 +++ wget-1.5.2/configure Tue Jun 23 23:36:31 1998 @@ -1009,9 +1009,15 @@ +case "$host_os" in + *win32) exeext='.exe';; + *) exeext='';; +esac + + echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1015: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1021: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1027,7 +1033,7 @@ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1067,7 +1073,7 @@ echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 -echo "configure:1071: checking for function prototypes" >&5 +echo "configure:1077: checking for function prototypes" >&5 if test "$am_cv_prog_cc_stdc" != no; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1080,12 +1086,12 @@ U=_ ANSI2KNR=./ansi2knr # Ensure some checks needed by ansi2knr itself. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1084: checking for ANSI C header files" >&5 +echo "configure:1090: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1093,7 +1099,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1110,7 +1116,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1128,7 +1134,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1149,7 +1155,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1160,7 +1166,7 @@ exit (0); } EOF -if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1187,17 +1193,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1191: checking for $ac_hdr" >&5 +echo "configure:1197: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1227,12 +1233,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1231: checking for working const" >&5 +echo "configure:1237: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1302,12 +1308,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1306: checking for size_t" >&5 +echo "configure:1312: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1335,12 +1341,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1339: checking for pid_t" >&5 +echo "configure:1345: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1368,14 +1374,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1372: checking whether byte ordering is bigendian" >&5 +echo "configure:1378: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1386,11 +1392,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:1390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1401,7 +1407,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1421,7 +1427,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1462,17 +1468,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1466: checking for $ac_hdr" >&5 +echo "configure:1472: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1502,17 +1508,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1506: checking for $ac_hdr" >&5 +echo "configure:1512: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1539,12 +1545,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1543: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1549: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1553,7 +1559,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1575,12 +1581,12 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1579: checking return type of signal handlers" >&5 +echo "configure:1585: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1597,7 +1603,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:1601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1617,10 +1623,10 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:1621: checking for struct utimbuf" >&5 +echo "configure:1627: checking for struct utimbuf" >&5 if test x"$ac_cv_header_utime_h" = xyes; then cat > conftest.$ac_ext < EOF @@ -1645,19 +1651,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1649: checking for working alloca.h" >&5 +echo "configure:1655: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1678,12 +1684,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1682: checking for alloca" >&5 +echo "configure:1688: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1738,12 +1744,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1742: checking whether alloca needs Cray hooks" >&5 +echo "configure:1748: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1772: checking for $ac_func" >&5 +echo "configure:1778: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1823,7 +1829,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1827: checking stack direction for C alloca" >&5 +echo "configure:1833: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1831,7 +1837,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1874,12 +1880,12 @@ for ac_func in strdup strstr strcasecmp strncasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1878: checking for $ac_func" >&5 +echo "configure:1884: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1929,12 +1935,12 @@ for ac_func in gettimeofday mktime strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1933: checking for $ac_func" >&5 +echo "configure:1939: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1981,15 +1987,15 @@ fi done -for ac_func in strerror vsnprintf select signal symlink isatty +for ac_func in strerror vsnprintf select signal symlink access isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1988: checking for $ac_func" >&5 +echo "configure:1994: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2039,12 +2045,12 @@ for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2043: checking for $ac_func" >&5 +echo "configure:2049: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2095,12 +2101,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2099: checking for $ac_func" >&5 +echo "configure:2105: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2145,7 +2151,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2149: checking for gethostbyname in -lnsl" >&5 +echo "configure:2155: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2153,7 +2159,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2198,7 +2204,7 @@ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2202: checking for socket in -lsocket" >&5 +echo "configure:2208: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2206,7 +2212,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2248,7 +2254,7 @@ if test "x${with_socks}" = xyes then echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:2252: checking for main in -lresolv" >&5 +echo "configure:2258: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2256,14 +2262,14 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2291,7 +2297,7 @@ fi echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6 -echo "configure:2295: checking for Rconnect in -lsocks" >&5 +echo "configure:2301: checking for Rconnect in -lsocks" >&5 ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2299,7 +2305,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocks $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2342,7 +2348,7 @@ ALL_LINGUAS="cs de hr no it pt_BR" echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2346: checking whether NLS is requested" >&5 +echo "configure:2352: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2355,10 +2361,11 @@ if test x"$HAVE_NLS" = xyes; then + echo "$ac_t"""language catalogs: $ALL_LINGUAS"" 1>&6 # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2362: checking for $ac_word" >&5 +echo "configure:2369: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2392,7 +2399,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2396: checking for $ac_word" >&5 +echo "configure:2403: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2427,7 +2434,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2431: checking for $ac_word" >&5 +echo "configure:2438: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2473,17 +2480,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2477: checking for $ac_hdr" >&5 +echo "configure:2484: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2513,12 +2520,12 @@ for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2517: checking for $ac_func" >&5 +echo "configure:2524: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2563,7 +2570,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2567: checking for gettext in -lintl" >&5 +echo "configure:2574: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2571,7 +2578,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2650,7 +2657,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2654: checking for $ac_word" >&5 +echo "configure:2661: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2830,6 +2837,7 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g s%@CC@%$CC%g s%@CPP@%$CPP%g +s%@exeext@%$exeext%g s%@U@%$U%g s%@ANSI2KNR@%$ANSI2KNR%g s%@ALLOCA@%$ALLOCA%g diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/configure.bat wget-1.5.2/configure.bat --- wget-1.5.1/configure.bat Thu Jun 12 14:33:41 1997 +++ wget-1.5.2/configure.bat Mon May 18 03:42:16 1998 @@ -17,7 +17,13 @@ rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. cls -copy windows\config.h.ms config.h > nul +if .%1 == .--borland goto :borland +if .%1 == .--msvc goto :msvc +if not .%BORPATH% == . goto :borland +if not .%1 == . goto :usage + +:msvc +copy windows\config.h.ms src\config.h > nul copy windows\Makefile.top Makefile > nul copy windows\Makefile.src src\Makefile > nul copy windows\Makefile.doc doc\Makefile > nul @@ -25,4 +31,17 @@ echo Type NMAKE to start compiling. echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first, echo and then NMAKE. +goto :end + +:borland +copy windows\config.h.bor src\config.h > nul +copy windows\Makefile.top.bor Makefile > nul +copy windows\Makefile.src.bor src\Makefile > nul +copy windows\Makefile.doc doc\Makefile > nul + +echo Type MAKE to start compiling. +goto :end +:usage +echo Usage: Configure [--borland | --msvc] +:end diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/configure.in wget-1.5.2/configure.in --- wget-1.5.1/configure.in Mon Apr 27 21:10:25 1998 +++ wget-1.5.2/configure.in Tue Jun 23 23:27:57 1998 @@ -113,6 +113,16 @@ AC_AIX dnl +dnl In case of {cyg,gnu}win32. Should be a _target_ test. +dnl Might also be erelevant for DJGPP. +dnl +case "$host_os" in + *win32) exeext='.exe';; + *) exeext='';; +esac +AC_SUBST(exeext) + +dnl dnl Check if we can handle prototypes. dnl AM_C_PROTOTYPES @@ -148,7 +158,7 @@ AC_FUNC_ALLOCA AC_CHECK_FUNCS(strdup strstr strcasecmp strncasecmp) AC_CHECK_FUNCS(gettimeofday mktime strptime) -AC_CHECK_FUNCS(strerror vsnprintf select signal symlink isatty) +AC_CHECK_FUNCS(strerror vsnprintf select signal symlink access isatty) AC_CHECK_FUNCS(uname gethostname) AC_CHECK_FUNCS(gethostbyname, [], [ diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/doc/ChangeLog wget-1.5.2/doc/ChangeLog --- wget-1.5.1/doc/ChangeLog Sat May 2 04:59:18 1998 +++ wget-1.5.2/doc/ChangeLog Wed Jun 24 00:00:05 1998 @@ -1,3 +1,20 @@ +1998-05-24 Hrvoje Niksic + + * Makefile.in (clean): Remove HTML files. + +1998-05-13 Hrvoje Niksic + + * wget.texi: Various updates. + (Proxies): New node. + +1998-05-09 Hrvoje Niksic + + * texinfo.tex: New file. + +1998-05-08 Hrvoje Niksic + + * Makefile.in (dvi): New target. + 1998-05-02 Hrvoje Niksic * wget.texi (Recursive Retrieval): Fix typo. Suggested by @@ -62,20 +79,20 @@ * wget.texi (Mailing List): Update. -Wed Apr 23 14:13:26 1997 Hrvoje Niksic +1997-04-23 Hrvoje Niksic * wget.texi (Advanced Options): Document `--follow-ftp'. -Mon Feb 17 21:08:15 1997 Hrvoje Niksic +1997-02-17 Hrvoje Niksic * wget.texi (Advanced Options): Document --proxy-user and --proxy-passwd. -Fri Feb 14 16:03:25 1997 Karl Eichwalder +1997-02-14 Karl Eichwalder * Makefile.in (install.wgetrc): Never ever nuke an existing rc file. -Sun Feb 2 15:28:00 1997 Hrvoje Niksic +1997-02-02 Hrvoje Niksic * wget.texi: Updated and revised. @@ -84,103 +101,103 @@ * wget.texi: Use ``...'' instead of "...". -Sat Feb 1 20:24:33 1997 Hrvoje Niksic +1997-02-01 Hrvoje Niksic * wget.texi (Domain Acceptance): Document --exclude-domains. -Tue Jan 21 15:16:28 1997 Hrvoje Niksic +1997-01-21 Hrvoje Niksic * wget.texi (Advanced Options): Document --ignore-length. -Mon Jan 20 02:51:44 1997 Hrvoje Niksic +1997-01-20 Hrvoje Niksic * wget.texi (Time-Stamping): New node. -Sun Jan 12 03:28:40 1997 Hrvoje Niksic +1997-01-12 Hrvoje Niksic * Makefile.in (distclean): Don't remove wget.info*. -Wed Jan 8 09:31:48 1997 Hrvoje Niksic +1997-01-08 Hrvoje Niksic * wget.texi (Mailing List): Update archive. (Portability): Update the Windows port by Budor. -Sat Dec 21 20:34:06 1996 Hrvoje Niksic +1996-12-21 Hrvoje Niksic * wget.texi (Security Considerations): New node. -Thu Dec 19 02:42:47 1996 Hrvoje Niksic +1996-12-19 Hrvoje Niksic * wget.texi (Advanced Options): Document --passive. -Thu Dec 12 18:33:09 1996 Dieter Baron +1996-12-12 Dieter Baron * wget.texi (Advanced Usage): Would reference prep instead of wuarchive. -Mon Nov 25 04:37:16 1996 Hrvoje Niksic +1996-11-25 Hrvoje Niksic * wget.texi (Advanced Options): Documented --retr-symlinks. -Sat Nov 23 14:41:36 1996 Hrvoje Niksic +1996-11-23 Hrvoje Niksic * wget.texi (Advanced Options): Document --delete-after. -Fri Nov 22 08:03:56 1996 Hrvoje Niksic +1996-11-22 Hrvoje Niksic * wget.texi (Portability): Add IRIX and FreeBSD as the "regular" platforms. -Wed Nov 20 03:49:00 1996 Hrvoje Niksic +1996-11-20 Hrvoje Niksic * wget.texi (Advanced Usage): Document dot-style. -Mon Nov 18 02:59:09 1996 Hrvoje Niksic +1996-11-18 Hrvoje Niksic * wget.texi (Advanced Usage): Dot customization example. (Sample Wgetrc): Likewise. -Sat Nov 16 04:26:56 1996 Hrvoje Niksic +1996-11-16 Hrvoje Niksic * wget.texi (Wgetrc Syntax): Explained emptying lists. -Wed Nov 13 10:19:02 1996 Hrvoje Niksic +1996-11-13 Hrvoje Niksic * wget.texi (Advanced Options): Document includes/excludes. (Wgetrc Commands): Likewise. -Sun Nov 10 19:49:04 1996 Hrvoje Niksic +1996-11-10 Hrvoje Niksic * wget.texi (Advanced Options): Document headers. -Thu Nov 7 18:33:10 1996 Hrvoje Niksic +1996-11-07 Hrvoje Niksic * sample.wgetrc: Added header examples. -Wed Nov 6 22:37:25 1996 Hrvoje Niksic +1996-11-06 Hrvoje Niksic * sample.wgetrc: Rewritten. * Makefile.in (install.wgetrc): Install sample.wgetrc. (uninstall.info): Use $(RM). -Wed Nov 6 02:31:06 1996 Hrvoje Niksic +1996-11-06 Hrvoje Niksic * wget.texi: Docfixes. -Sun Nov 3 04:34:11 1996 Hrvoje Niksic +1996-11-03 Hrvoje Niksic * wget.texi: Proofread; *many* docfixes. -Sat Nov 2 22:26:01 1996 Hrvoje Niksic +1996-11-02 Hrvoje Niksic * wget.texi (Introduction): Updated robots mailing list address. -Fri Nov 1 18:14:21 1996 Hrvoje Niksic +1996-11-01 Hrvoje Niksic * wget.texi: Minor docfixes. -Sat Oct 26 22:02:55 1996 Hrvoje Niksic +1996-10-26 Hrvoje Niksic * wget.texi (Advanced Usage): Document passwords better. @@ -188,19 +205,19 @@ * wget.texi (Option Syntax): Explain --. -Mon Oct 21 22:37:22 1996 Hrvoje Niksic +1996-10-21 Hrvoje Niksic * fetch.texi (No Parent): update. -Fri Oct 18 03:13:41 1996 Hrvoje Niksic +1996-10-18 Hrvoje Niksic * fetch.texi (Advanced Options): Docfix. -Thu Oct 17 07:07:56 1996 Tage Stabell-Kulo +1996-10-17 Tage Stabell-Kulo * geturl.texi (Advanced Options): Sort alphabetically. -Wed Oct 16 00:00:29 1996 Hrvoje Niksic +1996-10-16 Hrvoje Niksic * geturl.texi (Advanced Options): Describe -nr. (Advanced Usage): Moved -O pipelines to Guru Usage. @@ -209,15 +226,15 @@ * Makefile.in (RM): RM = rm -f. -Tue Oct 15 09:13:18 1996 Hrvoje Niksic +1996-10-15 Hrvoje Niksic * geturl.texi (Guru Usage): Add proxy-filling example. -Sat Oct 12 13:06:05 1996 Hrvoje Niksic +1996-10-12 Hrvoje Niksic * geturl.texi (Advanced Options): Added --spider. -Tue Oct 8 19:07:18 1996 Hrvoje Niksic +1996-10-08 Hrvoje Niksic * geturl.texi (Advanced Options): Added -X. diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/doc/Makefile.in wget-1.5.2/doc/Makefile.in --- wget-1.5.1/doc/Makefile.in Tue Mar 31 16:19:47 1998 +++ wget-1.5.2/doc/Makefile.in Sun May 24 04:40:42 1998 @@ -61,6 +61,8 @@ #wget.cat: $(MAN) # nroff -man $(srcdir)/$(MAN) > wget.cat +dvi: wget.dvi + wget.dvi: wget.texi $(TEXI2DVI) $(srcdir)/wget.texi @@ -124,7 +126,7 @@ # clean: - $(RM) *~ *.bak *.cat + $(RM) *~ *.bak *.cat *.html $(RM) *.dvi *.aux *.cp *.cps *.fn *.toc *.tp *.vr *.ps *.ky *.pg *.log distclean: clean diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/doc/wget.texi wget-1.5.2/doc/wget.texi --- wget-1.5.1/doc/wget.texi Tue May 5 09:12:14 1998 +++ wget-1.5.2/doc/wget.texi Tue Jun 23 23:32:43 1998 @@ -2,62 +2,37 @@ @c %**start of header @setfilename wget.info -@settitle Wget Manual - -@c Remove this if you don't use A4 paper. -@iftex -@afourpaper -@end iftex -@c %**end of header - +@settitle GNU Wget Manual +@c Disable the monstrous rectangles beside overfull hbox-es. +@finalout @c Use `odd' to print double-sided. @setchapternewpage on +@c %**end of header -@c Disable the monstrous rectangle beside overfull hbox-es. @iftex -@finalout +@c Remove this if you don't use A4 paper. +@afourpaper @end iftex +@set VERSION 1.5.2 +@set UPDATED May 1998 + @dircategory Net Utilities @dircategory World Wide Web @direntry -* Wget: (wget). The non-interactive network retriever. +* Wget: (wget). The non-interactive network downloader. @end direntry -@titlepage -@title Wget -@subtitle Version 1.5.1, February, 1998 +@ifinfo +This file documents the the GNU Wget utility for downloading network +data. -@author by Hrvoje Nik@v{s}i@'{c} -@sp 4 -@center Complete Reference, Updated for Wget Version 1.5.1 -@center Copyright @copyright{} 1996, 1997, 1998 Free Software Foundation, Inc. -@sp 4 - -Permission is granted to make and distribute verbatim -copies of this manual provided the copyright notice and -this permission notice are preserved on all copies. - -Permission is granted to copy and distribute modified -versions of this manual under the conditions for -verbatim copying, provided also that the sections -entitled ``Copying'' and ``GNU General Public License'' -are included exactly as in the original, and provided -that the entire resulting derived work is distributed -under the terms of a permission notice identical to this -one. - -Permission is granted to copy and distribute -translations of this manual into another language, -under the above conditions for modified versions, -except that this permission notice may be stated in a -translation approved by the Free Software Foundation. -@end titlepage +Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + +Permission is granted to make and distribute verbatim copies of +this manual provided the copyright notice and this permission notice +are preserved on all copies. -@ifinfo -Permission is granted to make and distribute verbatim copies of this -manual provided the copyright notice and this permission notice are -preserved on all copies. @ignore Permission is granted to process this file through TeX and print the results, provided the printed document carries a copying permission @@ -72,12 +47,39 @@ notice identical to this one. @end ifinfo +@titlepage +@title GNU Wget +@subtitle The noninteractive downloading utility +@subtitle Updated for Wget @value{VERSION}, @value{UPDATED} +@author by Hrvoje Nik@v{s}i@'{c} + +@page +@vskip 0pt plus 1filll +Copyright @copyright{} 1996, 1997, 1998 Free Software Foundation, Inc. + +Permission is granted to make and distribute verbatim copies of this +manual provided the copyright notice and this permission notice are +preserved on all copies. + +Permission is granted to copy and distribute modified versions of this +manual under the conditions for verbatim copying, provided also that the +sections entitled ``Copying'' and ``GNU General Public License'' are +included exactly as in the original, and provided that the entire +resulting derived work is distributed under the terms of a permission +notice identical to this one. + +Permission is granted to copy and distribute translations of this manual +into another language, under the above conditions for modified versions, +except that this permission notice may be stated in a translation +approved by the Free Software Foundation. +@end titlepage + @ifinfo @node Top, Overview, (dir), (dir) -@top Wget 1.5.1 +@top Wget @value{VERSION} -This manual documents version 1.5.1 of GNU Wget, the freely available -utility for network download. +This manual documents version @value{VERSION} of GNU Wget, the freely +available utility for network download. Copyright @copyright{} 1996, 1997, 1998 Free Software Foundation, Inc. @@ -144,11 +146,11 @@ @sp 1 @item -By default, Wget supports @sc{proxy} servers, which can lighten the -network load, speed up retrieval and provide access behind firewalls. -However, if you are behind a firewall that requires that you use a socks -style gateway, you can get the socks library and build wget with support -for socks. Wget also supports the passive @sc{ftp} downloading as an +By default, Wget supports proxy servers, which can lighten the network +load, speed up retrieval and provide access behind firewalls. However, +if you are behind a firewall that requires that you use a socks style +gateway, you can get the socks library and build wget with support for +socks. Wget also supports the passive @sc{ftp} downloading as an option. @sp 1 @@ -187,16 +189,12 @@ By default, Wget is very simple to invoke. The basic syntax is: @example -wget [@var{options}] @var{URL1} [@var{URL2} ...] +wget [@var{option}]@dots{} [@var{URL}]@dots{} @end example Wget will simply download all the @sc{url}s specified on the command line. @var{URL} is a @dfn{Uniform Resource Locator}, as defined below. -Be aware that @code{ksh} and its descendants (like @code{zsh}) kill off -the background processes during logout. To prevent this, use -@code{nohup}, as documented in system manuals. - However, you may wish to change some of the default parameters of Wget. You can do it two ways: permanently, adding the appropriate command to @file{.wgetrc} (@xref{Startup File}), or specifying it on @@ -220,13 +218,15 @@ @cindex URL @cindex URL syntax -@dfn{URL} is an acronym for Uniform Resource Locator. Wget recognizes -the @sc{url} syntax as per @sc{rfc1738}. This is the most widely used -form (square brackets denote optional parts): +@dfn{URL} is an acronym for Uniform Resource Locator. A uniform +resource locator is a compact string representation for a resource +available via the Internet. Wget recognizes the @sc{url} syntax as per +@sc{rfc1738}. This is the most widely used form (square brackets denote +optional parts): @example -http://host[:port]/path -ftp://host[:port]/path +http://host[:port]/directory/file +ftp://host[:port]/directory/file @end example You can also encode your username and password within a @sc{url}: @@ -236,7 +236,7 @@ http://user:password@@host/path @end example -Either @var{user} or @var{password}, or both may be left out. If you +Either @var{user} or @var{password}, or both, may be left out. If you leave out either the @sc{http} username or password, no authentication will be sent. If you leave out the @sc{ftp} username, @samp{anonymous} will be used. If you leave out the @sc{ftp} password, your email @@ -259,7 +259,7 @@ for text files. Here is an example: @example -ftp://host/dir/file;type=a +ftp://host/directory/file;type=a @end example Two alternative variants of @sc{url} specification are also supported, @@ -347,7 +347,8 @@ @item -b @itemx --background -Go to background immediately after startup. +Go to background immediately after startup. If no output file is +specified via the @samp{-o}, output is redirected to @file{wget-log}. @cindex execute wgetrc command @item -e @var{command} @@ -366,27 +367,27 @@ @cindex log file @item -o @var{logfile} @itemx --output-file=@var{logfile} -Log all messages to @var{logfile}. The messages are normally sent to -standard error. +Log all messages to @var{logfile}. The messages are normally reported +to standard error. @cindex append to log @item -a @var{logfile} @itemx --append-output=@var{logfile} -Append to @var{logfile}---the same as @samp{-o}, but appending to the -@var{logfile} instead of overwriting the old log file. - -If @var{logfile} does not exist, @ +Append to @var{logfile}. This is the same as @samp{-o}, only it appends +to @var{logfile} instead of overwriting the old log file. If +@var{logfile} does not exist, a new file is created. @cindex debug @item -d @itemx --debug Turn on debug output, meaning various information important to the developers of Wget if it does not work properly. Your system -administrator may have chosen to compile Wget without debug support. In -that case @samp{-d} will not work. Please note that even if the program -is compiled with debug support, it will @emph{not} print any debug info -unless @samp{-d} is turned on explicitly. @xref{Reporting Bugs} for -more information on how to send a bug report. +administrator may have chosen to compile Wget without debug support, in +which case @samp{-d} will not work. Please note that compiling with +debug support is always safe---Wget compiled with the debug support will +@emph{not} print any debug info unless requested with @samp{-d}. +@xref{Reporting Bugs} for more information on how to use @samp{-d} for +sending bug reports. @cindex quiet @item -q @@ -561,7 +562,7 @@ @cindex proxy @item -Y on/off @itemx --proxy=on/off -Turn @sc{proxy} support on or off. The proxy is on by default if the +Turn proxy support on or off. The proxy is on by default if the appropriate environmental variable is defined. @cindex quota @@ -623,6 +624,7 @@ are several examples of how @samp{--cut-dirs} option works. @example +@group No options -> ftp.xemacs.org/pub/xemacs/ -nH -> pub/xemacs/ -nH --cut-dirs=1 -> xemacs/ @@ -630,6 +632,7 @@ --cut-dirs=1 -> ftp.xemacs.org/xemacs/ ... +@end group @end example If you just want to get rid of the directory structure, this option is @@ -670,10 +673,10 @@ @item -C on/off @itemx --cache=on/off When set to off, disable server-side cache. In this case, Wget will -send the remote server an appropriate directive (@code{Pragma: +send the remote server an appropriate directive (@samp{Pragma: no-cache}) to get the file from the remote service, rather than returning the cached version. This is especially useful for retrieving -and flushing out-of-date documents on @sc{proxy} servers. +and flushing out-of-date documents on proxy servers. Caching is allowed by default. @@ -700,9 +703,11 @@ @samp{--header} more than once. @example +@group wget --header='Accept-Charset: iso-8859-2' \ --header='Accept-Language: hr' \ http://fly.cc.fer.hr/ +@end group @end example Specification of an empty string as the header value will clear all @@ -714,7 +719,7 @@ @item --proxy-user=@var{user} @itemx --proxy-passwd=@var{password} Specify the username @var{user} and password @var{password} for -authentication on a @sc{proxy} server. Wget will encode them using the +authentication on a proxy server. Wget will encode them using the @code{basic} authentication scheme. @cindex server response, save @@ -738,10 +743,10 @@ However, some sites have been known to impose the policy of tailoring the output according to the @code{User-Agent}-supplied information. While conceptually this is not such a bad idea, it has been abused by -servers denying information to clients other than Mozilla or MS IE. In -these cases it may be useful to ``fake'' the user-agent with this -option. In the following example Wget masquerades as Mozilla 4.03 -running on Solaris. +servers denying information to clients other than @code{Mozilla} or +Microsoft @code{Internet Explorer}. In these cases it may be useful to +``fake'' the user-agent with this option. In the following example Wget +masquerades as Mozilla 4.03 running on Solaris. @example wget -U "Mozilla/4.03 [en] (X11; I; SunOS 5.5.1 sun4u)" @@ -808,7 +813,7 @@ @item --delete-after This option tells Wget to delete every single file it downloads, @emph{after} having done so. It is useful for pre-fetching popular -pages through @sc{proxy}, e.g.: +pages through proxy, e.g.: @example wget -r -nd --delete-after http://whatever.com/~popular/page/ @@ -1024,14 +1029,13 @@ (e.g. @samp{www.srce.hr} and @samp{regoc.srce.hr} will be flagged as different hosts). -Note that @sc{http/1.1} allows one IP address to support several virtual -servers, each of them with its own root; this feature is also used by -many @sc{http/1.0} servers. Such ``servers'' are then distinguished by -their hostnames (all of which point to the same IP address); for this to -work, a client must send a @code{Host} header, which is what Wget does. -However, in that case Wget @emph{must not} try to divine a host's -``real'' address, nor try to use the same hostname for each access, -i.e. @samp{-nh} must be turned on. +Note that modern @sc{http} servers allows one IP address to host several +@dfn{virtual servers}, each having its own directory hieratchy. Such +``servers'' are distinguished by their hostnames (all of which point to +the same IP address); for this to work, a client must send a @code{Host} +header, which is what Wget does. However, in that case Wget @emph{must +not} try to divine a host's ``real'' address, nor try to use the same +hostname for each access, i.e. @samp{-nh} must be turned on. In other words, the @samp{-nh} option must be used to enabling the retrieval from virtual servers distinguished by their hostnames. As the @@ -1487,8 +1491,8 @@ denoting the value the command takes. It is @samp{on/off} for @samp{on} or @samp{off} (which can also be @samp{1} or @samp{0}), @var{string} for any non-empty string or @var{n} for a positive integer. For example, -you may specify @samp{use_proxy = off} to disable use of @sc{proxy} -servers by default. You may use @samp{inf} for infinite values, where +you may specify @samp{use_proxy = off} to disable use of proxy servers +by default. You may use @samp{inf} for infinite values, where appropriate. Most of the commands have their equivalent command-line option @@ -1630,7 +1634,7 @@ @item no_proxy = @var{string} Use @var{string} as the comma-separated list of domains to avoid in -@sc{proxy} loading, instead of the one specified in environment. +proxy loading, instead of the one specified in environment. @item output_document = @var{string} Set the output filename, the same as @samp{-O}. @@ -1643,11 +1647,11 @@ password defaults to @samp{username@@hostname.domainname}. @item proxy_user = @var{string} -Set @sc{proxy} authentication user name to @var{string}, like +Set proxy authentication user name to @var{string}, like @samp{--proxy-user}. @item proxy_passwd = @var{string} -Set @sc{proxy} authentication password to @var{string}, like +Set proxy authentication password to @var{string}, like @samp{--proxy-passwd}. @item quiet = on/off @@ -1703,7 +1707,7 @@ Set number of retries per @sc{url}, the same as @samp{-t}. @item use_proxy = on/off -Turn @sc{proxy} support on/off. The same as @samp{-Y}. +Turn proxy support on/off. The same as @samp{-Y}. @item verbose = on/off Turn verbose on/off, the same as @samp{-v}/@samp{-nv}. @@ -1852,15 +1856,17 @@ The response will be something like: @example ---13:30:45-- http://fly.cc.fer.hr:80/ +@group +--13:30:45-- http://fly.cc.fer.hr:80/en/ => `index.html' Connecting to fly.cc.fer.hr:80... connected! -HTTP request sent, fetching headers... done. -Length: 1,749 [text/html] +HTTP request sent, awaiting response... 200 OK +Length: 4,694 [text/html] - 0K -> . + 0K -> .... [100%] -13:30:46 (68.32K/s) - `index.html' saved [1749/1749] +13:30:46 (23.75 KB/s) - `index.html' saved [4694/4694] +@end group @end example @item @@ -1892,18 +1898,20 @@ password. @example +@group $ wget ftp://gnjilux.cc.fer.hr/welcome.msg ---23:35:55-- ftp://gnjilux.cc.fer.hr:21/welcome.msg +--10:08:47-- ftp://gnjilux.cc.fer.hr:21/welcome.msg => `welcome.msg' Connecting to gnjilux.cc.fer.hr:21... connected! Logging in as anonymous ... Logged in! ==> TYPE I ... done. ==> CWD not needed. ==> PORT ... done. ==> RETR welcome.msg ... done. Length: 1,340 (unauthoritative) - - 0K -> . - -23:35:56 (37.39K/s) - `welcome.msg' saved [1340] + + 0K -> . [100%] + +10:08:48 (1.28 MB/s) - `welcome.msg' saved [1340] +@end group @end example @item @@ -2095,6 +2103,7 @@ This chapter contains all the stuff that could not fit anywhere else. @menu +* Proxies:: Support for proxy servers * Distribution:: Getting the latest version. * Mailing List:: Wget mailing list for announcements and discussion. * Reporting Bugs:: How and where to report bugs. @@ -2102,38 +2111,105 @@ * Signals:: Signal-handling performed by Wget. @end menu -@node Distribution, Mailing List, Various, Various -@section Distribution -@cindex latest version +@node Proxies, Distribution, Various, Various +@section Proxies +@cindex proxies + +@dfn{Proxies} are special-purpose @sc{http} servers designed to transfer +data from remote servers to local clients. One typical use of proxies +is lightening network load for users behind a slow connection. This is +achieved by channeling all @sc{http} and @sc{ftp} requests through the +proxy which caches the transferred data. When a cached resource is +requested again, proxy will return the data from cache. Another use for +proxies is for companies that separate (for security reasons) their +internal networks from the rest of Internet. In order to obtain +information from the Web, their users connect and retrieve remote data +using an authorized proxy. + +Wget supports proxies for both @sc{http} and @sc{ftp} retrievals. The +standard way to specify proxy location, which Wget recognizes, is using +the following environment variables: + +@table @code +@item http_proxy +This variable should contain the @sc{url} of the proxy for @sc{http} +connections. + +@item ftp_proxy +This variable should contain the @sc{url} of the proxy for @sc{http} +connections. It is quite common that @sc{http_proxy} and @sc{ftp_proxy} +are set to the same @sc{url}. + +@item no_proxy +This variable should contain a comma-separated list of domain extensions +proxy should @emph{not} be used for. For instance, if the value of +@code{no_proxy} is @samp{.mit.edu}, proxy will not be used to retrieve +documents from MIT. +@end table -Like all GNU utilities, the latest version of Wget can be found at the -master GNU archive site prep.ai.mit.edu, and its mirrors. For example, -Wget 1.5.1 is at: +In addition to the environment variables, proxy location and settings +may be specified from within Wget itself. + +@table @samp +@item -Y on/off +@itemx --proxy=on/off +@itemx proxy = on/off +This option may be used to turn the proxy support on or off. Proxy +support is on by default, provided that the appropriate environment +variables are set. + +@item http_proxy = @var{URL} +@itemx ftp_proxy = @var{URL} +@itemx no_proxy = @var{string} +These startup file variables allow you to override the proxy settings +specified by the environment. +@end table + +Some proxy servers require authorization to enable you to use them. The +authorization consists of @dfn{username} and @dfn{password}, which must +be sent by Wget. As with @sc{http} authorization, several +authentication schemes exist. For proxy authorization only the +@code{Basic} authentication scheme is currently implemented. + +You may specify your username and password either through the proxy +@sc{url} or through the command-line options. Assuming that the +company's proxy is located at @samp{proxy.srce.hr} at port 8001, a proxy +@sc{url} location containing authorization data might look like this: @example -. +http://hniksic:mypassword@@proxy.company.com:8001/ @end example -I'll try to make a ``real'' home page for Wget some time in the future. -If you would like to do it, please say so---I'll be delighted. +Alternatively, you may use the @samp{proxy-user} and +@samp{proxy-password} options, and the equivalent @file{.wgetrc} +settings @code{proxy_user} and @code{proxy_passwd} to set the proxy +username and password. + +@node Distribution, Mailing List, Proxies, Various +@section Distribution +@cindex latest version + +Like all GNU utilities, the latest version of Wget can be found at the +master GNU archive site prep.ai.mit.edu, and its mirrors. For example, +Wget @value{VERSION} can be found at +@url{ftp://prep.ai.mit.edu/pub/gnu/wget-@value{VERSION}.tar.gz} @node Mailing List, Reporting Bugs, Distribution, Various @section Mailing List @cindex mailing list @cindex list -Wget has its own mailing list at @code{}, thanks +Wget has its own mailing list at @email{wget@@sunsite.auc.dk}, thanks to Karsten Thygesen. The mailing list is for discussion of Wget features and web, reporting Wget bugs (those that you think may be of interest to the public) and mailing announcements. You are welcome to subscribe. The more people on the list, the better! -To subscribe, send mail to @code{}. +To subscribe, send mail to @email{wget-subscribe@@sunsite.auc.dk}. the magic word @samp{subscribe} in the subject line. Unsubscribe by -mailing to @code{}. +mailing to @email{wget-unsubscribe@@sunsite.auc.dk}. -The mailing list is archived at -@code{http://fly.cc.fer.hr/en/wget-archive.mbox}. +The mailing list is archived at @url{http://fly.cc.fer.hr/archive/wget}. @node Reporting Bugs, Portability, Mailing List, Various @section Reporting Bugs @@ -2142,9 +2218,9 @@ @cindex bug reports You are welcome to send bug reports about GNU Wget to -@code{}. The bugs that you think are of the +@email{bug-wget@@gnu.org}. The bugs that you think are of the interest to the public (i.e. more people should be informed about them) -can be Cc-ed to the mailing list at @code{}. +can be Cc-ed to the mailing list at @email{wget@@sunsite.auc.dk}. Before actually submitting a bug report, please try to follow a few simple guidelines. @@ -2162,6 +2238,13 @@ /tmp/log}, you should try to see if it will crash with a simpler set of options. +Also, while I will probably be interested to know the contents of your +@file{.wgetrc} file, just dumping it into the debug message is probably +a bad idea. Instead, you should first try to see if the bug repeats +with @file{.wgetrc} moved out of the way. Only if it turns out that +@file{.wgetrc} settings affect the bug, should you mail me the relevant +parts of the file. + @item Please start Wget with @samp{-d} option and send the log (or the relevant parts of it). If Wget was compiled without debug support, @@ -2182,27 +2265,27 @@ @cindex operating systems Since Wget uses GNU Autoconf for building and configuring, and avoids -using ``special'' features of any one Unix system, it should compile -(and work) on all common flavors of Unix. +using ``special'' ultra--mega--cool features of any particular Unix, it +should compile (and work) on all common Unix flavors. -This version was compiled and tested this version on various Unix -systems, including Solaris, Linux, SunOS, OSF (aka Digital Unix), and -Ultrix; refer to the file @file{MACHINES} in the distribution directory -for a comprehensive list. If you compile it on an architecture not -listed there, please let me know. +Various Wget versions have been compiled and tested under many kinds of +Unix systems, including Solaris, Linux, SunOS, OSF (aka Digital Unix), +Ultrix, *BSD, IRIX, and others; refer to the file @file{MACHINES} in the +distribution directory for a comprehensive list. If you compile it on +an architecture not listed there, please let me know so I can update it. Wget should also compile on the other Unix systems, not listed in @file{MACHINES}. If it doesn't, please let me know. -Thanks to Darko Budor and other contributors, this version of Wget -compiles and works on Windows 95 and Windows NT platforms. It has been -compiled successfully using MS Visual C++ 4.0 and Watcom C compiler, -with Winsock as networking software. Of course, it is crippled of many +Thanks to kind contributors, this version of Wget compiles and works on +Microsoft Windows 95 and Windows NT platforms. It has been compiled +successfully using MS Visual C++ 4.0, Watcom, and Borland C compilers, +with Winsock as networking software. Naturally, it is crippled of some features available on Unix, but it should work as a substitute for people stuck with Windows. Note that the Windows port is -@strong{neither tested nor maintained} by me, or anyone at GNU---all -questions and problems should be reported to -@code{}. +@strong{neither tested nor maintained} by me---all questions and +problems should be reported to Wget mailing list at +@email{wget@@sunsite.auc.dk} where the maintainers will look at them. @node Signals, , Portability, Various @section Signals @@ -2262,7 +2345,7 @@ the robots @code{META} tag. The description of the norobots standard was written, and is maintained -by Martijn Koster @code{}. With his +by Martijn Koster @email{m.koster@@webcrawler.com}. With his permission, I contribute a (slightly modified) texified version of the @sc{res}. @@ -2310,11 +2393,8 @@ community to protect @sc{www} server against unwanted accesses by their robots. -The latest version of this document can be found at: - -@example -http://info.webcrawler.com/mak/projects/robots/norobots.html -@end example +The latest version of this document can be found at +@url{http://info.webcrawler.com/mak/projects/robots/norobots.html}. @node RES Format, User-Agent Field, Introduction to RES, Robots @subsection RES Format @@ -2408,7 +2488,6 @@ # Cybermapper knows where to go. User-agent: cybermapper Disallow: - @end example This example indicates that no robots should visit this site further: @@ -2453,10 +2532,10 @@ @cindex contributors @iftex -GNU Wget was written by Hrvoje Nik@v{s}i@'{c} @code{}. +GNU Wget was written by Hrvoje Nik@v{s}i@'{c} @email{hniksic@@srce.hr}. @end iftex @ifinfo -GNU Wget was written by Hrvoje Niksic @code{}. +GNU Wget was written by Hrvoje Niksic @email{hniksic@@srce.hr}. @end ifinfo However, its development could never have gone as far as it has, were it not for the help of many people, either with bug reports, feature @@ -2473,7 +2552,7 @@ Shawn McHorse---bug reports and patches. @item -Kaveh R. Ghazi---on-the-fly ansi2knr-ization. +Kaveh R. Ghazi---on-the-fly @code{ansi2knr}-ization. @item Gordon Matzigkeit---@file{.netrc} support. @@ -2489,7 +2568,7 @@ @end ifinfo @item -Darko Budor---port to Windows. +Darko Budor---initial port to Windows. @item Antonio Rosella---help and suggestions, plust the Italian translation. @@ -2535,6 +2614,7 @@ John Burden, Wanderlei Cavassin, Gilles Cedoc, +Tim Charron, Noel Cragg, @iftex Kristijan @v{C}onka@v{s}, @@ -2560,6 +2640,7 @@ Andy Eskilsson, Masashi Fujita, Marcel Gerrits, +Mathieu Guillaume, Karl Heuer, Gregor Hoffleit, Erik Magnus Hulthen, @@ -2579,19 +2660,37 @@ @end ifinfo Robert Kleine, Fila Kolodny, +Alexander Kourakos, Martin Kraemer, +@tex +$\Sigma\acute{\iota}\mu o\varsigma\; +\Xi\varepsilon\nu\iota\tau\acute{\epsilon}\lambda\lambda\eta\varsigma$ +(Simos KSenitellis), +@end tex +@ifinfo +Simos KSenitellis, +@end ifinfo Tage Stabell-Kulo, Hrvoje Lacko, +Dave Love, Jordan Mendelson, +Lin Zhe Min, Charlie Negyesi, -Francois Pinard, Andrew Pollock, Steve Pothier, Marin Purgar, Jan Prikryl, Keith Refson, Tobias Ringstrom, +@c Texinfo doesn't grok @'{@i}, so we have to use TeX itself. +@tex +Juan Jos\'{e} Rodr\'{\i}gues, +@end tex +@ifinfo +Juan Jose Rodrigues, +@end ifinfo Robert Schmidt, +Toomas Soome, Sven Sternberger, Markus Strasser, Mike Thomas, @@ -2606,9 +2705,8 @@ @end ifinfo Kristijan Zimmer. -Thanks everyone; I've wouldn't have done it without you. Apologies to -all who I accidentally left out. Also thanks to all the subscribers of -the Wget mailing list. +Apologies to all who I accidentally left out, and many thanks to all the +subscribers of the Wget mailing list. @node Copying, Concept Index, Appendices, Top @unnumbered GNU GENERAL PUBLIC LICENSE Binary files wget-1.5.1/po/cs.gmo and wget-1.5.2/po/cs.gmo differ Binary files wget-1.5.1/po/de.gmo and wget-1.5.2/po/de.gmo differ Binary files wget-1.5.1/po/hr.gmo and wget-1.5.2/po/hr.gmo differ Binary files wget-1.5.1/po/it.gmo and wget-1.5.2/po/it.gmo differ Binary files wget-1.5.1/po/messages and wget-1.5.2/po/messages differ Binary files wget-1.5.1/po/no.gmo and wget-1.5.2/po/no.gmo differ Binary files wget-1.5.1/po/pt_BR.gmo and wget-1.5.2/po/pt_BR.gmo differ diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/po/wget.pot wget-1.5.2/po/wget.pot --- wget-1.5.1/po/wget.pot Tue May 5 08:56:58 1998 +++ wget-1.5.2/po/wget.pot Tue Jun 23 23:53:01 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-05-05 08:56+0200\n" +"POT-Creation-Date: 1998-06-23 23:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,250 +16,250 @@ #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:146 src/http.c:335 +#: src/ftp.c:147 src/http.c:346 #, c-format msgid "Connecting to %s:%hu... " msgstr "" -#: src/ftp.c:168 src/ftp.c:409 src/http.c:352 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:189 src/http.c:363 +#: src/ftp.c:190 src/http.c:374 msgid "connected!\n" msgstr "" -#: src/ftp.c:190 +#: src/ftp.c:191 #, c-format msgid "Logging in as %s ... " msgstr "" -#: src/ftp.c:199 src/ftp.c:251 src/ftp.c:299 src/ftp.c:351 src/ftp.c:445 -#: src/ftp.c:518 src/ftp.c:566 src/ftp.c:614 +#: src/ftp.c:200 src/ftp.c:253 src/ftp.c:301 src/ftp.c:353 src/ftp.c:447 +#: src/ftp.c:520 src/ftp.c:568 src/ftp.c:616 msgid "Error in server response, closing control connection.\n" msgstr "" -#: src/ftp.c:207 +#: src/ftp.c:208 msgid "Error in server greeting.\n" msgstr "" -#: src/ftp.c:214 src/ftp.c:260 src/ftp.c:308 src/ftp.c:360 src/ftp.c:455 -#: src/ftp.c:528 src/ftp.c:576 src/ftp.c:624 +#: src/ftp.c:216 src/ftp.c:262 src/ftp.c:310 src/ftp.c:362 src/ftp.c:457 +#: src/ftp.c:530 src/ftp.c:578 src/ftp.c:626 msgid "Write failed, closing control connection.\n" msgstr "" -#: src/ftp.c:221 +#: src/ftp.c:223 msgid "The server refuses login.\n" msgstr "" -#: src/ftp.c:228 +#: src/ftp.c:230 msgid "Login incorrect.\n" msgstr "" -#: src/ftp.c:235 +#: src/ftp.c:237 msgid "Logged in!\n" msgstr "" -#: src/ftp.c:268 +#: src/ftp.c:270 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "" -#: src/ftp.c:281 +#: src/ftp.c:283 msgid "done. " msgstr "" -#: src/ftp.c:287 +#: src/ftp.c:289 msgid "==> CWD not needed.\n" msgstr "" -#: src/ftp.c:315 +#: src/ftp.c:317 #, c-format msgid "" "No such directory `%s'.\n" "\n" msgstr "" -#: src/ftp.c:329 src/ftp.c:597 src/ftp.c:645 src/url.c:1421 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1426 msgid "done.\n" msgstr "" #. do not CWD -#: src/ftp.c:333 +#: src/ftp.c:335 msgid "==> CWD not required.\n" msgstr "" -#: src/ftp.c:367 +#: src/ftp.c:369 msgid "Cannot initiate PASV transfer.\n" msgstr "" -#: src/ftp.c:371 +#: src/ftp.c:373 msgid "Cannot parse PASV response.\n" msgstr "" -#: src/ftp.c:385 +#: src/ftp.c:387 #, c-format msgid "Will try connecting to %s:%hu.\n" msgstr "" -#: src/ftp.c:472 +#: src/ftp.c:432 src/ftp.c:504 src/ftp.c:548 +msgid "done. " +msgstr "" + +#: src/ftp.c:474 #, c-format msgid "Bind error (%s).\n" msgstr "" -#: src/ftp.c:488 +#: src/ftp.c:490 msgid "Invalid PORT.\n" msgstr "" -#: src/ftp.c:502 src/ftp.c:546 -msgid "done. " -msgstr "" - -#: src/ftp.c:535 +#: src/ftp.c:537 msgid "" "\n" "REST failed, starting from scratch.\n" msgstr "" -#: src/ftp.c:584 +#: src/ftp.c:586 #, c-format msgid "" "No such file `%s'.\n" "\n" msgstr "" -#: src/ftp.c:632 +#: src/ftp.c:634 #, c-format msgid "" "No such file or directory `%s'.\n" "\n" msgstr "" -#: src/ftp.c:690 src/ftp.c:697 +#: src/ftp.c:692 src/ftp.c:699 #, c-format msgid "Length: %s" msgstr "" -#: src/ftp.c:692 src/ftp.c:699 +#: src/ftp.c:694 src/ftp.c:701 #, c-format msgid " [%s to go]" msgstr "" -#: src/ftp.c:701 +#: src/ftp.c:703 msgid " (unauthoritative)\n" msgstr "" -#: src/ftp.c:719 +#: src/ftp.c:721 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "" -#: src/ftp.c:727 +#: src/ftp.c:729 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "" -#: src/ftp.c:744 +#: src/ftp.c:746 msgid "Control connection closed.\n" msgstr "" -#: src/ftp.c:762 +#: src/ftp.c:764 msgid "Data transfer aborted.\n" msgstr "" -#: src/ftp.c:828 +#: src/ftp.c:830 #, c-format msgid "File `%s' already there, not retrieving.\n" msgstr "" -#: src/ftp.c:894 src/http.c:911 +#: src/ftp.c:896 src/http.c:922 #, c-format msgid "(try:%2d)" msgstr "" -#: src/ftp.c:953 src/http.c:1097 +#: src/ftp.c:955 src/http.c:1116 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" "\n" msgstr "" -#: src/ftp.c:999 +#: src/ftp.c:1001 #, c-format msgid "Using `%s' as listing tmp file.\n" msgstr "" -#: src/ftp.c:1011 +#: src/ftp.c:1013 #, c-format msgid "Removed `%s'.\n" msgstr "" -#: src/ftp.c:1047 +#: src/ftp.c:1049 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "" -#: src/ftp.c:1094 src/http.c:1035 +#: src/ftp.c:1096 src/http.c:1054 #, c-format msgid "" "Local file `%s' is more recent, not retrieving.\n" "\n" msgstr "" -#: src/ftp.c:1100 src/http.c:1041 +#: src/ftp.c:1102 src/http.c:1060 #, c-format msgid "The sizes do not match (local %ld), retrieving.\n" msgstr "" -#: src/ftp.c:1117 +#: src/ftp.c:1119 msgid "Invalid name of the symlink, skipping.\n" msgstr "" -#: src/ftp.c:1134 +#: src/ftp.c:1136 #, c-format msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr "" -#: src/ftp.c:1141 +#: src/ftp.c:1143 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "" -#: src/ftp.c:1152 +#: src/ftp.c:1154 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "" -#: src/ftp.c:1164 +#: src/ftp.c:1166 #, c-format msgid "Skipping directory `%s'.\n" msgstr "" -#: src/ftp.c:1173 +#: src/ftp.c:1175 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "" -#: src/ftp.c:1189 +#: src/ftp.c:1191 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "" -#: src/ftp.c:1209 +#: src/ftp.c:1211 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" -#: src/ftp.c:1248 +#: src/ftp.c:1250 #, c-format msgid "Not descending to `%s' as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:1293 +#: src/ftp.c:1295 #, c-format msgid "Rejecting `%s'.\n" msgstr "" @@ -267,17 +267,17 @@ #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1340 +#: src/ftp.c:1342 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "" -#: src/ftp.c:1400 +#: src/ftp.c:1402 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "" -#: src/ftp.c:1405 +#: src/ftp.c:1407 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "" @@ -314,27 +314,12 @@ msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#: src/getopt.c:557 -#, c-format -msgid "%s: unrecognized option, character code 0%o\n" -msgstr "" - -#: src/getopt.c:560 -#, c-format -msgid "%s: unrecognized option `-%c'\n" -msgstr "" - #. 1003.2 specifies the format of this message. #: src/getopt.c:563 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: src/getopt.c:598 -#, c-format -msgid "%s: option `-%c' requires an argument\n" -msgstr "" - #. 1003.2 specifies the format of this message. #: src/getopt.c:602 #, c-format @@ -379,208 +364,208 @@ msgid "Unknown error" msgstr "" -#: src/html.c:433 src/html.c:435 +#: src/html.c:435 src/html.c:437 #, c-format msgid "Index of /%s on %s:%d" msgstr "" -#: src/html.c:457 +#: src/html.c:459 msgid "time unknown " msgstr "" -#: src/html.c:461 +#: src/html.c:463 msgid "File " msgstr "" -#: src/html.c:464 +#: src/html.c:466 msgid "Directory " msgstr "" -#: src/html.c:467 +#: src/html.c:469 msgid "Link " msgstr "" -#: src/html.c:470 +#: src/html.c:472 msgid "Not sure " msgstr "" -#: src/html.c:488 +#: src/html.c:490 #, c-format msgid " (%s bytes)" msgstr "" -#: src/http.c:481 +#: src/http.c:492 msgid "Failed writing HTTP request.\n" msgstr "" -#: src/http.c:486 +#: src/http.c:497 #, c-format msgid "%s request sent, awaiting response... " msgstr "" -#: src/http.c:525 +#: src/http.c:536 msgid "End of file while parsing headers.\n" msgstr "" -#: src/http.c:536 +#: src/http.c:547 #, c-format msgid "Read error (%s) in headers.\n" msgstr "" -#: src/http.c:576 +#: src/http.c:587 msgid "No data received" msgstr "" -#: src/http.c:578 +#: src/http.c:589 msgid "Malformed status line" msgstr "" -#: src/http.c:583 +#: src/http.c:594 msgid "(no description)" msgstr "" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:667 +#: src/http.c:678 msgid "Authorization failed.\n" msgstr "" -#: src/http.c:674 +#: src/http.c:685 msgid "Unknown authentication scheme.\n" msgstr "" -#: src/http.c:737 +#: src/http.c:748 #, c-format msgid "Location: %s%s\n" msgstr "" -#: src/http.c:738 src/http.c:763 +#: src/http.c:749 src/http.c:774 msgid "unspecified" msgstr "" -#: src/http.c:739 +#: src/http.c:750 msgid " [following]" msgstr "" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:753 +#: src/http.c:764 msgid "Length: " msgstr "" -#: src/http.c:758 +#: src/http.c:769 #, c-format msgid " (%s to go)" msgstr "" -#: src/http.c:763 +#: src/http.c:774 msgid "ignored" msgstr "" -#: src/http.c:846 +#: src/http.c:857 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:861 +#: src/http.c:872 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "" -#: src/http.c:967 +#: src/http.c:978 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "" -#: src/http.c:977 +#: src/http.c:988 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "" -#: src/http.c:993 +#: src/http.c:1011 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "" -#: src/http.c:1005 +#: src/http.c:1023 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" -#: src/http.c:1013 +#: src/http.c:1031 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" -#: src/http.c:1045 +#: src/http.c:1064 msgid "Remote file is newer, retrieving.\n" msgstr "" -#: src/http.c:1079 +#: src/http.c:1098 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" msgstr "" -#: src/http.c:1111 +#: src/http.c:1130 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "" -#: src/http.c:1119 +#: src/http.c:1138 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" "\n" msgstr "" -#: src/http.c:1131 +#: src/http.c:1150 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "" -#: src/http.c:1142 +#: src/http.c:1161 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "" -#: src/http.c:1150 +#: src/http.c:1169 #, c-format msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "" -#: src/init.c:311 src/netrc.c:246 +#: src/init.c:312 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" -#: src/init.c:332 src/init.c:338 +#: src/init.c:333 src/init.c:339 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "" -#: src/init.c:369 +#: src/init.c:370 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" -#: src/init.c:460 +#: src/init.c:461 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "" -#: src/init.c:487 +#: src/init.c:488 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "" -#: src/init.c:505 src/init.c:762 src/init.c:784 src/init.c:857 +#: src/init.c:506 src/init.c:763 src/init.c:785 src/init.c:858 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "" -#: src/init.c:618 src/init.c:640 src/init.c:662 src/init.c:688 +#: src/init.c:619 src/init.c:641 src/init.c:663 src/init.c:689 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "" @@ -750,31 +735,31 @@ #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:517 src/main.c:558 src/main.c:589 +#: src/main.c:518 src/main.c:560 src/main.c:591 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "" -#: src/main.c:569 +#: src/main.c:571 msgid "Can't be verbose and quiet at the same time.\n" msgstr "" -#: src/main.c:575 +#: src/main.c:577 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" #. No URL specified. -#: src/main.c:584 +#: src/main.c:586 #, c-format msgid "%s: missing URL\n" msgstr "" -#: src/main.c:668 +#: src/main.c:670 #, c-format msgid "No URLs found in %s.\n" msgstr "" -#: src/main.c:677 +#: src/main.c:679 #, c-format msgid "" "\n" @@ -782,14 +767,14 @@ "Downloaded: %s bytes in %d files\n" msgstr "" -#: src/main.c:682 +#: src/main.c:684 #, c-format msgid "Download quota (%s bytes) EXCEEDED!\n" msgstr "" #. Please note that the double `%' in `%%s' is intentional, because #. redirect_output passes tmp through printf. -#: src/main.c:709 +#: src/main.c:711 msgid "%s received, redirecting output to `%%s'.\n" msgstr "" @@ -822,27 +807,27 @@ msgid "%s: Couldn't find usable socket driver.\n" msgstr "" -#: src/netrc.c:330 +#: src/netrc.c:334 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "" -#: src/netrc.c:362 +#: src/netrc.c:365 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "" -#: src/netrc.c:426 +#: src/netrc.c:429 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "" -#: src/netrc.c:436 +#: src/netrc.c:439 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "" -#: src/recur.c:449 src/retr.c:466 +#: src/recur.c:449 src/retr.c:462 #, c-format msgid "Removing %s.\n" msgstr "" @@ -856,55 +841,55 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "" -#: src/retr.c:197 +#: src/retr.c:193 #, c-format msgid "" "\n" " [ skipping %dK ]" msgstr "" -#: src/retr.c:348 +#: src/retr.c:344 msgid "Could not find proxy host.\n" msgstr "" -#: src/retr.c:359 +#: src/retr.c:355 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:402 +#: src/retr.c:398 #, c-format msgid "%s: Redirection to itself.\n" msgstr "" -#: src/retr.c:487 +#: src/retr.c:483 msgid "" "Giving up.\n" "\n" msgstr "" -#: src/retr.c:487 +#: src/retr.c:483 msgid "" "Retrying.\n" "\n" msgstr "" -#: src/url.c:940 +#: src/url.c:935 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "" -#: src/url.c:954 +#: src/url.c:950 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "" -#: src/url.c:1363 +#: src/url.c:1368 #, c-format msgid "Converting %s... " msgstr "" -#: src/url.c:1368 src/url.c:1379 +#: src/url.c:1373 src/url.c:1384 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "" diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/ChangeLog wget-1.5.2/src/ChangeLog --- wget-1.5.1/src/ChangeLog Tue May 5 10:34:05 1998 +++ wget-1.5.2/src/ChangeLog Tue Jun 23 23:51:17 1998 @@ -1,3 +1,95 @@ +1998-06-23 Hrvoje Niksic + + * version.c: Wget 1.5.2 is released. + +1998-06-23 Dave Love + + * ftp.c, init.c, netrc.c: Include errno.h. + + * http.c: Include errno.h and time header. + + * Makefile.in (exext): Define. + (install.bin, uninstall.bin): Use it. + +1998-06-21 Hrvoje Niksic + + * http.c (http_loop): Don't attempt to compare local and remote + sizes if the remote size is unknown. + +1998-06-16 Hrvoje Niksic + + * url.c (get_urls_html): Use malloc() instead of alloca in the + loop. + +1998-06-13 Hrvoje Niksic + + * version.c: Wget 1.5.2-b4 is released. + +1998-06-13 Hrvoje Niksic + + * url.c (get_urls_html): Ignore spaces before and after the URI. + +1998-06-08 Wanderlei Antonio Cavassin + + * ftp.c (getftp): Translate `done'. + +1998-06-06 Hrvoje Niksic + + * version.c: Wget 1.5.2-b3 is released. + +1998-06-06 Alexander Kourakos + + * init.c (cleanup): Close dfp, don't free it. + +1998-06-06 Hrvoje Niksic + + * utils.c (make_directory): Twiddle. + + * config.h.in: Added template for access(). + +1998-06-05 Mathieu Guillaume + + * html.c (htmlfindurl): Download + +1998-06-03 Hrvoje Niksic + + * utils.c (file_exists_p): Use access() with two arguments. + +1998-05-27 Martin Kraemer + + * netrc.c (parse_netrc): Correct logic. + +1998-05-27 Hrvoje Niksic + + * ftp.c (getftp): Added `break'; suggested by Lin Zhe Min + . + +1998-05-24 Hrvoje Niksic + + * version.c: Wget 1.5.2-b2 is released. + +1998-05-18 Juan Jose Rodriguez + + * mswindows.h: Don't translate mkdir to _mkdir under Borland. + +1998-05-17 Hrvoje Niksic + + * retr.c (elapsed_time): Return correct value when + HAVE_GETTIMEOFDAY is undefined. + +1998-05-13 Hrvoje Niksic + + * version.c: Wget 1.5.2-b1 is released. + +1998-05-08 Hrvoje Niksic + + * getopt.c (_getopt_internal): Use exec_name instead of argv[0]. + (_getopt_internal): Don't translate `#if 0'-ed strings. + +1998-05-06 Douglas E. Wegscheid + + * mswindows.c (ws_handler): Use fork_to_background(). + 1998-05-05 Hrvoje Niksic * version.c: Wget 1.5.1 is released. diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/Makefile.in wget-1.5.2/src/Makefile.in --- wget-1.5.1/src/Makefile.in Tue Apr 28 15:46:54 1998 +++ wget-1.5.2/src/Makefile.in Tue Jun 23 23:29:18 1998 @@ -40,6 +40,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +exeext = @exeext@ INCLUDES = -I. -I$(srcdir) @@ -82,7 +83,7 @@ # Dependencies for building -wget: $(OBJ) +wget$(exeext): $(OBJ) $(LINK) $(OBJ) $(LIBS) ansi2knr: ansi2knr.o @@ -98,19 +99,19 @@ uninstall: uninstall.bin -install.bin: wget +install.bin: wget$(exeext) $(top_srcdir)/mkinstalldirs $(bindir) - $(INSTALL_PROGRAM) wget $(bindir)/wget + $(INSTALL_PROGRAM) wget$(exeext) $(bindir)/wget$(exeext) uninstall.bin: - $(RM) $(bindir)/wget + $(RM) $(bindir)/wget$(exeext) # # Dependencies for cleanup # clean: - $(RM) *.o wget *~ *.bak core $(ANSI2KNR) *._o *._c + $(RM) *.o wget$(exeext) *~ *.bak core $(ANSI2KNR) *._o *._c distclean: clean $(RM) Makefile config.h diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/config.h.in wget-1.5.2/src/config.h.in --- wget-1.5.1/src/config.h.in Mon Apr 27 21:15:21 1998 +++ wget-1.5.2/src/config.h.in Sat Jun 6 03:36:34 1998 @@ -1,5 +1,5 @@ /* Configuration header file. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of Wget. @@ -128,6 +128,9 @@ /* Define if you have the symlink function. */ #undef HAVE_SYMLINK + +/* Define if you have the access function. */ +#undef HAVE_ACCESS /* Define if you have the isatty function. */ #undef HAVE_ISATTY diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/ftp-ls.c wget-1.5.2/src/ftp-ls.c --- wget-1.5.1/src/ftp-ls.c Thu Apr 30 19:57:22 1998 +++ wget-1.5.2/src/ftp-ls.c Fri May 8 04:03:52 1998 @@ -57,14 +57,14 @@ } -/* The function parses the Un*x-ish style directory listing stored in - file, and returns the linked list of fileinfo (system-independent) - entries. The file is considered to be produced by the standard - Unix ls -la output (whatever that meant:). BSD (no group) and SYSV - (with group) listings are handled. +/* Convert the Un*x-ish style directory listing stored in FILE to a + linked list of fileinfo (system-independent) entries. The contents + of FILE are considered to be produced by the standard Unix `ls -la' + output (whatever that might be). BSD (no group) and SYSV (with + group) listings are handled. The time stamps are stored in a separate variable, time_t - compatible (I hope). The time-zones are ignored (unfortunately). */ + compatible (I hope). The timezones are ignored. */ static struct fileinfo * ftp_parse_unix_ls (const char *file) { @@ -79,7 +79,7 @@ struct tm timestruct, *tnow; time_t timenow; - char *line, *tok; /* tokenizer */ + char *line, *tok; /* tokenizer */ struct fileinfo *dir, *l, cur; /* list creation */ fp = fopen (file, "rb"); @@ -159,8 +159,7 @@ while ((tok = strtok (NULL, " "))) { --next; - if (next < 0) /* I.e. a month name was not - encountered. */ + if (next < 0) /* a month name was not encountered */ { for (i = 0; i < 12; i++) if (!strcmp (tok, months[i])) @@ -226,12 +225,12 @@ sec = (*tok - '0') + 10 * sec; } } - } /* ISDIGIT (*tok) */ + } if (year) DEBUGP (("year: %d (no tm); ", year)); else DEBUGP (("time: %02d:%02d:%02d (no yr); ", hour, min, sec)); - } /* next == 3 */ + } else if (next == 2) /* The file name */ { int fnlen; @@ -304,7 +303,7 @@ else error = 1; break; - } /* next == 2 */ + } else abort (); } /* while */ @@ -340,7 +339,7 @@ /* Get the current time. */ timenow = time (NULL); tnow = localtime (&timenow); - /* Build the time-stamp (the idea by zaga@fly). */ + /* Build the time-stamp (the idea by zaga@fly.cc.fer.hr). */ timestruct.tm_sec = sec; timestruct.tm_min = min; timestruct.tm_hour = hour; @@ -367,10 +366,9 @@ timestruct.tm_isdst = -1; l->tstamp = mktime (×truct); /* store the time-stamp */ - /* Free the line. */ free (line); } - /* Close the file. */ + fclose (fp); return dir; } diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/ftp.c wget-1.5.2/src/ftp.c --- wget-1.5.1/src/ftp.c Fri May 1 19:30:47 1998 +++ wget-1.5.2/src/ftp.c Tue Jun 23 23:29:18 1998 @@ -32,6 +32,7 @@ #endif #include #include +#include #include "wget.h" #include "utils.h" @@ -208,6 +209,7 @@ CLOSE (csock); rbuf_uninitialize (&con->rbuf); return err; + break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, @@ -427,7 +429,7 @@ } passive_mode_open= 1; /* Flag to avoid accept port */ if (!opt.server_response) - logputs (LOG_VERBOSE, "done. "); + logputs (LOG_VERBOSE, _("done. ")); } /* err==FTP_OK */ } diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/getopt.c wget-1.5.2/src/getopt.c --- wget-1.5.1/src/getopt.c Mon Mar 16 15:25:00 1998 +++ wget-1.5.2/src/getopt.c Fri May 8 03:42:32 1998 @@ -452,7 +452,7 @@ { if (opterr) fprintf (stderr, _("%s: option `%s' is ambiguous\n"), - argv[0], argv[optind]); + exec_name, argv[optind]); nextchar += strlen (nextchar); optind++; return '?'; @@ -476,12 +476,12 @@ /* --option */ fprintf (stderr, _("%s: option `--%s' doesn't allow an argument\n"), - argv[0], pfound->name); + exec_name, pfound->name); else /* +option or -option */ fprintf (stderr, _("%s: option `%c%s' doesn't allow an argument\n"), - argv[0], argv[optind - 1][0], pfound->name); + exec_name, argv[optind - 1][0], pfound->name); } nextchar += strlen (nextchar); return '?'; @@ -496,7 +496,7 @@ if (opterr) fprintf (stderr, _("%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]); + exec_name, argv[optind - 1]); nextchar += strlen (nextchar); return optstring[0] == ':' ? ':' : '?'; } @@ -526,11 +526,11 @@ if (argv[optind][1] == '-') /* --option */ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), - argv[0], nextchar); + exec_name, nextchar); else /* +option or -option */ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), - argv[0], argv[optind][0], nextchar); + exec_name, argv[optind][0], nextchar); } nextchar = (char *) ""; optind++; @@ -554,13 +554,13 @@ { #if 0 if (c < 040 || c >= 0177) - fprintf (stderr, _("%s: unrecognized option, character code 0%o\n"), - argv[0], c); + fprintf (stderr, "%s: unrecognized option, character code 0%o\n", + exec_name, c); else - fprintf (stderr, _("%s: unrecognized option `-%c'\n"), argv[0], c); + fprintf (stderr, "%s: unrecognized option `-%c'\n", exec_name, c); #else /* 1003.2 specifies the format of this message. */ - fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); + fprintf (stderr, _("%s: illegal option -- %c\n"), exec_name, c); #endif } optopt = c; @@ -595,12 +595,12 @@ if (opterr) { #if 0 - fprintf (stderr, _("%s: option `-%c' requires an argument\n"), - argv[0], c); + fprintf (stderr, "%s: option `-%c' requires an argument\n", + exec_name, c); #else /* 1003.2 specifies the format of this message. */ fprintf (stderr, _("%s: option requires an argument -- %c\n"), - argv[0], c); + exec_name, c); #endif } optopt = c; diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/html.c wget-1.5.2/src/html.c --- wget-1.5.1/src/html.c Fri May 1 18:49:58 1998 +++ wget-1.5.2/src/html.c Sun Jun 7 00:31:48 1998 @@ -17,9 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* #### "Simple" is an understatement. Calling this parser - "brain-damaged" would hit much closer to truth. Rewrite it! */ - #include #include @@ -45,9 +42,15 @@ static state_t global_state; +struct tag_attr { + char *tag; + char *attr; +}; + + /* Match a string against a null-terminated list of identifiers. */ static int -idmatch (tag_t *tags, const char *tag, const char *attr) +idmatch (struct tag_attr *tags, const char *tag, const char *attr) { int i; @@ -72,7 +75,7 @@ state_t *s; /* NULL-terminated list of tags and modifiers someone would want to follow -- feel free to edit to suit your needs: */ - static tag_t html_allow[] = { + static struct tag_attr html_allow[] = { { "a", "href" }, { "img", "src" }, { "img", "href" }, @@ -87,6 +90,7 @@ { "bgsound", "src" }, { "area", "href" }, { "img", "lowsrc" }, + { "input", "src" }, /* Tags below this line are treated specially. */ { "base", "href" }, { "meta", "content" }, @@ -342,11 +346,10 @@ static char * html_quote_string (const char *s) { - const char *b; + const char *b = s; char *p, *res; int i; - b = s; /* Pass through the string, and count the new size. */ for (i = 0; *s; s++, i++) { @@ -357,7 +360,6 @@ else if (*s == '\"') i += 5; /* `quot;' */ } - /* Allocate it. */ res = (char *)xmalloc (i + 1); s = b; for (p = res; *s; s++) diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/html.h wget-1.5.2/src/html.h --- wget-1.5.1/src/html.h Sun Feb 1 21:47:57 1998 +++ wget-1.5.2/src/html.h Fri Jun 5 18:13:02 1998 @@ -29,12 +29,6 @@ char *base; } state_t; -typedef struct -{ - char *tag; - char *attr; -} tag_t; - struct fileinfo; /* Function declarations */ diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/http.c wget-1.5.2/src/http.c --- wget-1.5.1/src/http.c Tue May 5 10:33:24 1998 +++ wget-1.5.2/src/http.c Tue Jun 23 23:29:18 1998 @@ -32,6 +32,17 @@ # include #endif #include +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #ifdef WINDOWS # include @@ -107,9 +118,8 @@ parse_http_status_line (const char *line, const char **reason_phrase_ptr) { /* (the variables must not be named `major' and `minor', because - that breaks build on SunOS4.) */ - int mjr, mnr; /* HTTP major and minor version */ - int statcode; /* HTTP status code */ + that breaks compilation with SunOS4 cc.) */ + int mjr, mnr, statcode; const char *p; *reason_phrase_ptr = NULL; @@ -164,8 +174,7 @@ /* Functions to be used as arguments to header_process(): */ -struct http_process_range_closure -{ +struct http_process_range_closure { long first_byte_pos; long last_byte_pos; long entity_length; @@ -992,6 +1001,13 @@ } if (!(*dt & RETROKF)) { + if (!opt.verbose) + { + /* #### Ugly ugly ugly! */ + char *hurl = str_url (u->proxy ? u->proxy : u, 1); + logprintf (LOG_NONVERBOSE, "%s:\n", hurl); + free (hurl); + } logprintf (LOG_NOTQUIET, _("%s ERROR %d: %s.\n"), tms, hstat.statcode, hstat.error); logputs (LOG_VERBOSE, "\n"); @@ -1032,14 +1048,15 @@ match, and local file is newer than the remote file, it will not be retrieved. Otherwise, the normal download procedure is resumed. */ - if (local_size == hstat.contlen && tml >= tmr) + if (tml >= tmr && + (hstat.contlen == -1 || local_size == hstat.contlen)) { logprintf (LOG_VERBOSE, _("\ Local file `%s' is more recent, not retrieving.\n\n"), u->local); FREEHSTAT (hstat); return RETROK; } - else if (local_size != hstat.contlen) + else if (tml >= tmr) logprintf (LOG_VERBOSE, _("\ The sizes do not match (local %ld), retrieving.\n"), local_size); else @@ -1274,9 +1291,9 @@ /* Authorization support: We support two authorization schemes: - - `Basic' scheme, consisting of base64-ing USER:PASSWORD string; + * `Basic' scheme, consisting of base64-ing USER:PASSWORD string; - - `Digest' scheme, added by Junio Hamano , + * `Digest' scheme, added by Junio Hamano , consisting of answering to the server's challenge with the proper MD5 digests. */ diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/init.c wget-1.5.2/src/init.c --- wget-1.5.1/src/init.c Fri May 1 19:43:20 1998 +++ wget-1.5.2/src/init.c Tue Jun 23 23:29:18 1998 @@ -31,6 +31,7 @@ #else # include #endif +#include #ifdef HAVE_PWD_H #include @@ -605,7 +606,7 @@ /* Check for "inf". */ if (p[0] == 'i' && p[1] == 'n' && p[2] == 'f' && p[3] == '\0') { - *out = 0L; + *out = 0; return 1; } /* Search for digits and construct result. */ @@ -907,7 +908,8 @@ recursive_cleanup (); clean_hosts (); free_netrc (netrc_list); - FREE_MAYBE (opt.dfp); + if (opt.dfp) + fclose (opt.dfp); FREE_MAYBE (opt.lfilename); free (opt.dir_prefix); FREE_MAYBE (opt.input_filename); diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/main.c wget-1.5.2/src/main.c --- wget-1.5.1/src/main.c Fri May 1 18:56:08 1998 +++ wget-1.5.2/src/main.c Sat May 9 18:05:26 1998 @@ -444,7 +444,7 @@ append_to_log = 1; break; case 'B': - setval ("basehref", optarg); + setval ("base", optarg); break; case 'C': setval ("cache", optarg); @@ -514,6 +514,7 @@ default: printf (_("%s: illegal option -- `-n%c'\n"), exec_name, *p); print_usage (); + printf ("\n"); printf (_("Try `%s --help\' for more options.\n"), exec_name); exit (1); } @@ -555,6 +556,7 @@ case '?': print_usage (); + printf ("\n"); printf (_("Try `%s --help' for more options.\n"), exec_name); exit (0); break; diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/md5.c wget-1.5.2/src/md5.c --- wget-1.5.1/src/md5.c Tue Apr 28 07:12:53 1998 +++ wget-1.5.2/src/md5.c Wed May 6 16:33:31 1998 @@ -122,6 +122,8 @@ return md5_read_ctx (ctx, resbuf); } +/* Unused in Wget */ +#if 0 /* Compute MD5 message digest for bytes read from STREAM. The resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ @@ -194,6 +196,7 @@ /* Put result in desired memory area. */ return md5_finish_ctx (&ctx, resblock); } +#endif /* 0 */ void diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/mswindows.c wget-1.5.2/src/mswindows.c --- wget-1.5.1/src/mswindows.c Sat May 2 05:11:25 1998 +++ wget-1.5.2/src/mswindows.c Wed May 6 15:46:32 1998 @@ -152,7 +152,7 @@ #ifdef CTRLBREAK_BACKGND case CTRL_BREAK_EVENT: #endif - ws_backgnd (); + fork_to_background (); break; case CTRL_SHUTDOWN_EVENT: case CTRL_CLOSE_EVENT: diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/mswindows.h wget-1.5.2/src/mswindows.h --- wget-1.5.1/src/mswindows.h Fri May 1 19:40:32 1998 +++ wget-1.5.2/src/mswindows.h Mon May 18 16:46:29 1998 @@ -38,7 +38,7 @@ /* Microsoft says stat is _stat, Borland doesn't */ #ifdef _MSC_VER -#define stat _stat +# define stat _stat #endif #define REALCLOSE(x) closesocket (x) @@ -49,7 +49,14 @@ /* #### Do we need this? */ #include -#define mkdir(a, b) _mkdir(a) /* bletch! */ + +/* Windows compilers accept only one arg to mkdir. */ +#ifndef __BORLANDC__ +# define mkdir(a, b) _mkdir(a) +#else /* __BORLANDC__ */ +# define mkdir(a, b) mkdir(a) +#endif /* __BORLANDC__ */ + #include /* Declarations of various socket errors: */ diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/netrc.c wget-1.5.2/src/netrc.c --- wget-1.5.1/src/netrc.c Tue Apr 28 23:41:13 1998 +++ wget-1.5.2/src/netrc.c Tue Jun 23 23:29:18 1998 @@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* This file used to be kept in synch with the code in Fetchmail, but + the latter has diverged since. */ + #ifdef HAVE_CONFIG_H # include #endif @@ -30,6 +33,7 @@ # include #endif #include +#include #include "wget.h" #include "utils.h" @@ -94,7 +98,7 @@ { if (!l->host) continue; - else if (!strcasecmp(l->host, host)) + else if (!strcasecmp (l->host, host)) break; } if (l) @@ -102,7 +106,7 @@ if (*acc) { /* Looking for password in .netrc. */ - if (!strcmp(l->acc, *acc)) + if (!strcmp (l->acc, *acc)) *passwd = l->passwd; /* usernames match; password OK */ else *passwd = NULL; /* usernames don't match */ @@ -341,8 +345,7 @@ /* Fetch the next token. */ if (!strcmp (tok, "account")) last_token = tok_account; - - if (!strcmp (tok, "default")) + else if (!strcmp (tok, "default")) { maybe_add_to_list (¤t, &retval); } @@ -485,4 +488,3 @@ exit (0); } #endif /* STANDALONE */ - diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/retr.c wget-1.5.2/src/retr.c --- wget-1.5.1/src/retr.c Fri May 1 19:39:13 1998 +++ wget-1.5.2/src/retr.c Sun May 17 03:08:38 1998 @@ -51,20 +51,16 @@ /* From http.c. */ uerr_t http_loop PARAMS ((struct urlinfo *, char **, int *)); -/* Retrieval buffer size for get_contents. */ -#define BUFFER_SIZE 8192 - /* Flags for show_progress(). */ enum spflags { SP_NONE, SP_INIT, SP_FINISH }; static int show_progress PARAMS ((long, long, enum spflags)); /* Reads the contents of file descriptor FD, until it is closed, or a - read error occurs. The data is read in parts BUFFER_SIZE bytes - long, and stored to stream fp, which should have been open for - writing. If BUF is non-NULL and its file descriptor is equal to - FD, flush RBUF first. This function will *not* use the rbuf_* - functions! + read error occurs. The data is read in 8K chunks, and stored to + stream fp, which should have been open for writing. If BUF is + non-NULL and its file descriptor is equal to FD, flush RBUF first. + This function will *not* use the rbuf_* functions! The EXPECTED argument is passed to show_progress() unchanged, but otherwise ignored. @@ -86,14 +82,14 @@ struct rbuf *rbuf) { int res; - static char c[BUFFER_SIZE]; + static char c[8192]; *len = restval; if (opt.verbose) show_progress (restval, expected, SP_INIT); if (rbuf && RBUF_FD (rbuf) == fd) { - while ((res = rbuf_flush (rbuf, c, BUFFER_SIZE)) != 0) + while ((res = rbuf_flush (rbuf, c, sizeof (c))) != 0) { if (fwrite (c, sizeof (char), res, fp) < res) return -2; @@ -108,7 +104,7 @@ /* Read from fd while there is available data. */ do { - res = iread (fd, c, BUFFER_SIZE); + res = iread (fd, c, sizeof (c)); if (res > 0) { if (fwrite (c, sizeof (char), res, fp) < res) @@ -255,7 +251,7 @@ return ((t.tv_sec - internal_secs) * 1000 + (t.tv_usec / 1000 - internal_msecs)); #else - return (long)time (NULL) - internal_secs; + return 1000 * ((long)time (NULL) - internal_secs); #endif } diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/url.c wget-1.5.2/src/url.c --- wget-1.5.1/src/url.c Mon May 4 00:53:23 1998 +++ wget-1.5.2/src/url.c Tue Jun 16 04:55:27 1998 @@ -825,9 +825,9 @@ { long nread; FILE *fp; - char *buf; - const char *pbuf; - int size, first_time; + char *orig_buf; + const char *buf; + int step, first_time; urlpos *first, *current, *old; if (file && !HYPHENP (file)) @@ -842,45 +842,47 @@ else fp = stdin; /* Load the file. */ - load_file (fp, &buf, &nread); + load_file (fp, &orig_buf, &nread); if (file && !HYPHENP (file)) fclose (fp); DEBUGP (("Loaded HTML file %s (size %ld).\n", file, nread)); first = current = NULL; first_time = 1; /* Iterate over the URLs in BUF, picked by htmlfindurl(). */ - for (pbuf = buf; (pbuf = htmlfindurl (pbuf, - nread - (pbuf - buf), - &size, first_time)); - pbuf += size) - { - int i, no_proto, skip_blanks; + for (buf = orig_buf; + (buf = htmlfindurl (buf, nread - (buf - orig_buf), &step, first_time)); + buf += step) + { + int i, no_proto; + int size = step; + const char *pbuf = buf; char *constr, *base; const char *cbase; - if (first_time) - first_time = 0; - /* This is a simple mechanism for brain-damaged pages that refer - to URI-s as . If the URI is absolute, - the spaces will be silently skipped. Otherwise, the spaces - will still be taken for a legal part of a relative URI. Note - that you can still write without spaces - having any special meaning. Thanks to Hrvoje Lacko - . */ - for (skip_blanks = 0; ISSPACE (pbuf[skip_blanks]) && skip_blanks < size; - skip_blanks++); + first_time = 0; + + /* A frequent phenomenon that needs to be handled are pages + generated by brain-damaged HTML generators, which refer to to + URI-s as . We simply ignore + any spaces at the beginning or at the end of the string. + This is probably not strictly correct, but that's what the + browsers do, so we may follow. May the authors of "WYSIWYG" + HTML tools burn in hell for the damage they've inflicted! */ + while ((pbuf < buf + step) && ISSPACE (*pbuf)) + ++pbuf; + while (size && ISSPACE (pbuf[size])) + --size; + for (i = 0; protostrings[i]; i++) { - if (!strncasecmp (protostrings[i], pbuf + skip_blanks, - MINVAL (strlen (protostrings[i]), - size - skip_blanks))) + if (!strncasecmp (protostrings[i], pbuf, + MINVAL (strlen (protostrings[i]), size))) break; } - /* The second part of the check is provided for bd pages - refering to http:URL. See below for details. */ + /* Check for http:RELATIVE_URI. See below for details. */ if (protostrings[i] - && !(strncasecmp (pbuf + skip_blanks, "http:", 5) == 0 - && strncasecmp (pbuf + skip_blanks, "http://", 7) != 0)) + && !(strncasecmp (pbuf, "http:", 5) == 0 + && strncasecmp (pbuf, "http://", 7) != 0)) { no_proto = 0; } @@ -891,17 +893,8 @@ relative URI-s as . Just strip off the silly leading "http:" (as well as any leading blanks before it). */ - if ((size > skip_blanks + 5) && - !strncasecmp ("http:", pbuf + skip_blanks, 5)) - { - pbuf += skip_blanks + 5; - size -= skip_blanks + 5; - } - } - if (!no_proto && skip_blanks) - { - pbuf += skip_blanks; - size -= skip_blanks; + if ((size > 5) && !strncasecmp ("http:", pbuf, 5)) + pbuf += 5, size -= 5; } if (!no_proto) { @@ -933,12 +926,15 @@ { if (!opt.quiet && !silent) { - char *temp = (char *)alloca (size + 1); + /* Use malloc, not alloca because this is called in + a loop. */ + char *temp = (char *)malloc (size + 1); strncpy (temp, pbuf, size); temp[size] = '\0'; logprintf (LOG_NOTQUIET, _("Error (%s): Link %s without a base provided.\n"), file, temp); + free (temp); } continue; } @@ -974,13 +970,15 @@ const char *tmp2; tmp2 = html_base (); - tmp = (char *)alloca (size + 1); + /* Use malloc, not alloca because this is called in a loop. */ + tmp = (char *)xmalloc (size + 1); strncpy (tmp, pbuf, size); tmp[size] = '\0'; logprintf (LOG_ALWAYS, "file %s; this_url %s; base %s\nlink: %s; constr: %s\n", file, this_url ? this_url : "(null)", tmp2 ? tmp2 : "(null)", tmp, constr); + free (tmp); } #endif @@ -1004,8 +1002,7 @@ else if (no_proto) current->flags |= UNOPROTO; } - /* Free the buffer. */ - free (buf); + free (orig_buf); return first; } @@ -1078,9 +1075,17 @@ else { /* If the dir exists as a file name, remove it first. This - is *only* for Wget to work with buggy buggy buggy http - servers. This situation will *not* occur when contacting - a normal server. */ + is *only* for Wget to work with buggy old CERN http + servers. Here is the scenario: When Wget tries to + retrieve a directory without a slash, e.g. + http://foo/bar (bar being a directory), CERN server will + not redirect it too http://foo/bar/ -- it will generate a + directory listing containing links to bar/file1, + bar/file2, etc. Wget will lose because it saves this + HTML listing to a file `bar', so it cannot create the + directory. To work around this, if the file of the same + name exists, we just remove it and create the directory + anyway. */ DEBUGP (("Removing %s because of directory danger!\n", t)); unlink (t); } @@ -1446,14 +1451,17 @@ if (*s2 == '/') return xstrdup (s2); - /* s1 should *not* be absolute, if s2 wasn't. */ + /* S1 should *not* be absolute, if S2 wasn't. */ assert (*s1 != '/'); i = cnt = 0; /* Skip the directories common to both strings. */ while (1) { - for (; s1[i] && s2[i] && s1[i] == s2[i] && s1[i] != '/' && s2[i] != '/'; - i++); + while (s1[i] && s2[i] + && (s1[i] == s2[i]) + && (s1[i] != '/') + && (s2[i] != '/')) + ++i; if (s1[i] == '/' && s2[i] == '/') cnt = ++i; else @@ -1464,7 +1472,7 @@ ++sepdirs1; /* Now, construct the file as of: - ../ repeated sepdirs1 time - - all the non-mutual directories of s2. */ + - all the non-mutual directories of S2. */ res = (char *)xmalloc (3 * sepdirs1 + strlen (s2 + cnt) + 1); for (i = 0; i < sepdirs1; i++) memcpy (res + 3 * i, "../", 3); diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/utils.c wget-1.5.2/src/utils.c --- wget-1.5.1/src/utils.c Sat May 2 05:09:07 1998 +++ wget-1.5.2/src/utils.c Tue Jun 16 04:29:27 1998 @@ -282,7 +282,7 @@ E.g. "a/b/c/./../d/.." will yield "a/b". This function originates from GNU Bash. - Changes by hniksic: + Changes for Wget: Always use '/' as stub_char. Don't check for local things using canon_stat. Change the original string instead of strdup-ing. @@ -441,7 +441,7 @@ file_exists_p (const char *filename) { #ifdef HAVE_ACCESS - return access (filename) >= 0; + return access (filename, F_OK) >= 0; #else struct stat buf; return stat (filename, &buf) >= 0; @@ -505,16 +505,16 @@ int make_directory (const char *directory) { - int i, status, quit; + int quit = 0; + int i; char *dir; - struct stat stbuf; /* Make a copy of dir, to be able to write to it. Otherwise, the function is unsafe if called with a read-only char *argument. */ STRDUP_ALLOCA (dir, directory); + /* If the first character of dir is '/', skip it (and thus enable creation of absolute-pathname directories. */ - quit = 0; for (i = (*dir == '/'); 1; ++i) { for (; dir[i] && dir[i] != '/'; i++) @@ -523,8 +523,7 @@ quit = 1; dir[i] = '\0'; /* Check whether the directory already exists. */ - status = stat (dir, &stbuf); - if (status != 0) + if (!file_exists_p (dir)) { if (mkdir (dir, 0777) < 0) return -1; @@ -537,7 +536,7 @@ return 0; } -static int in_acclist PARAMS ((const char **, const char *, int)); +static int in_acclist PARAMS ((const char *const *, const char *, int)); /* Determine whether a file is acceptable to be followed, according to lists of patterns to accept/reject. */ @@ -553,13 +552,13 @@ if (opt.accepts) { if (opt.rejects) - return (in_acclist ((const char **)opt.accepts, s, 1) - && !in_acclist ((const char **)opt.rejects, s, 1)); + return (in_acclist ((const char *const *)opt.accepts, s, 1) + && !in_acclist ((const char *const *)opt.rejects, s, 1)); else - return in_acclist ((const char **)opt.accepts, s, 1); + return in_acclist ((const char *const *)opt.accepts, s, 1); } else if (opt.rejects) - return !in_acclist ((const char **) opt.rejects, s, 1); + return !in_acclist ((const char *const *)opt.rejects, s, 1); return 1; } @@ -646,7 +645,7 @@ If the BACKWARD is 0, don't do backward comparison -- just compare them normally. */ static int -in_acclist (const char **accepts, const char *s, int backward) +in_acclist (const char *const *accepts, const char *s, int backward) { for (; *accepts; accepts++) { diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/version.c wget-1.5.2/src/version.c --- wget-1.5.1/src/version.c Fri Apr 24 00:29:54 1998 +++ wget-1.5.2/src/version.c Sat Jun 13 06:53:10 1998 @@ -1 +1 @@ -char *version_string = "1.5.1"; +char *version_string = "1.5.2"; diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/src/wget.h wget-1.5.2/src/wget.h --- wget-1.5.1/src/wget.h Fri May 1 19:47:06 1998 +++ wget-1.5.2/src/wget.h Sat Jun 13 06:52:54 1998 @@ -120,15 +120,23 @@ #define ARRAY_SIZE(array) (sizeof (array) / sizeof (*(array))) +/* Note that this much more elegant definition cannot be used: + + #define STRDUP_ALLOCA(str) (strcpy ((char *)alloca (strlen (str) + 1), str)) + + This is because some compilers don't handle alloca() as argument to + function correctly. Gcc under Intel has been reported to offend in + this case. */ + #define STRDUP_ALLOCA(ptr, str) do { \ (ptr) = (char *)alloca (strlen (str) + 1); \ strcpy (ptr, str); \ } while (0) +#define ALLOCA_ARRAY(type, len) ((type *) alloca ((len) * sizeof (type))) + #define XREALLOC_ARRAY(ptr, type, len) \ ((void) (ptr = (type *) xrealloc (ptr, (len) * sizeof (type)))) - -#define ALLOCA_ARRAY(type, len) ((type *) alloca ((len) * sizeof (type))) /* Generally useful if you want to avoid arbitrary size limits but don't need a full dynamic array. Assumes that BASEVAR points to a diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/Makefile.src wget-1.5.2/windows/Makefile.src --- wget-1.5.1/windows/Makefile.src Mon Apr 27 21:51:27 1998 +++ wget-1.5.2/windows/Makefile.src Wed May 6 18:44:22 1998 @@ -36,7 +36,7 @@ #DEBUGLF = /pdb:wget.pdb /debug /debugtype:cv /map:wget.map /opt:noref LIBS = kernel32.lib advapi32.lib wsock32.lib user32.lib -INCLUDES = /I. /I.. +INCLUDES = /I. COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEBUGCF) $(DEFS) $(CFLAGS) LINK = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@ @@ -88,18 +88,4 @@ # Dependencies: -connect$o: wget.h options.h utils.h connect.h host.h -ftp-basic$o: wget.h options.h utils.h ftp-basic.h connect.h host.h retr.h -ftp-ls$o: wget.h url.h utils.h ftp.h options.h -ftp$o: wget.h options.h utils.h url.h ftp.h ftp-basic.h html.h connect.h host.h retr.h netrc.h -getopt$o: getopt.h -host$o: wget.h options.h utils.h url.h host.h -html$o: wget.h options.h url.h utils.h ftp.h html.h -http$o: wget.h options.h utils.h url.h host.h retr.h connect.h netrc.h -init$o: wget.h options.h utils.h init.h url.h ftp.h host.h recur.h netrc.h -main$o: wget.h options.h utils.h url.h init.h retr.h recur.h ftp.h getopt.h -netrc$o: wget.h utils.h netrc.h options.h -recur$o: wget.h options.h url.h recur.h utils.h retr.h ftp.h host.h -retr$o: wget.h options.h utils.h retr.h url.h recur.h ftp.h html.h host.h connect.h -url$o: wget.h url.h host.h html.h utils.h -utils$o: wget.h utils.h options.h +!include "..\windows\wget.dep" diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/Makefile.src.bor wget-1.5.2/windows/Makefile.src.bor --- wget-1.5.1/windows/Makefile.src.bor Thu Jan 1 02:00:00 1970 +++ wget-1.5.2/windows/Makefile.src.bor Wed May 13 17:35:15 1998 @@ -0,0 +1,58 @@ +## Compiler, linker, and lib stuff +## Makefile for use with watcom win95/winnt executable. + +CC=bcc32 +LINK=tlink32 + +LFLAGS= +CFLAGS=-DWINDOWS -DHAVE_CONFIG_H -I. -H -H=wget.csm -w- + +## variables +OBJS=cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj \ + ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html.obj \ + http.obj init.obj log.obj main.obj md5.obj netrc.obj rbuf.obj \ + alloca.obj \ + recur.obj retr.obj url.obj utils.obj version.obj mswindows.obj + +LIBDIR=$(MAKEDIR)\..\lib + +wget.exe: $(OBJS) + $(LINK) @&&| +$(LFLAGS) -Tpe -ap -c + +$(LIBDIR)\c0x32.obj+ +alloca.obj+ +version.obj+ +utils.obj+ +url.obj+ +retr.obj+ +recur.obj+ +rbuf.obj+ +netrc.obj+ +mswindows.obj+ +md5.obj+ +main.obj+ +log.obj+ +init.obj+ +http.obj+ +html.obj+ +host.obj+ +headers.obj+ +getopt.obj+ +ftp-opie.obj+ +ftp-ls.obj+ +ftp-basic.obj+ +ftp.obj+ +fnmatch.obj+ +connect.obj+ +cmpt.obj +$<,$* +$(LIBDIR)\import32.lib+ +$(LIBDIR)\cw32.lib + + + +| + +o = .obj + +!include "..\windows\wget.dep" diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/Makefile.top wget-1.5.2/windows/Makefile.top --- wget-1.5.1/windows/Makefile.top Mon Apr 27 21:50:04 1998 +++ wget-1.5.2/windows/Makefile.top Wed May 6 18:43:13 1998 @@ -62,8 +62,6 @@ wget.zip: $(SUBDIRS) $(RM) wget.zip - zip -Djl9@ wget.zip < << -AUTHORS COPYING INSTALL MACHINES MAILING-LIST NEWS README DOC\\sample.wgetrc -<< + zip -Djl9 wget.zip AUTHORS COPYING INSTALL MACHINES MAILING-LIST NEWS README DOC\\sample.wgetrc zip -Dj9 wget.zip SRC\\WGET.EXE DOC\\WGET.HLP diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/Makefile.top.bor wget-1.5.2/windows/Makefile.top.bor --- wget-1.5.1/windows/Makefile.top.bor Thu Jan 1 02:00:00 1970 +++ wget-1.5.2/windows/Makefile.top.bor Wed May 6 18:41:15 1998 @@ -0,0 +1,65 @@ +# Makefile for `Wget' utility +# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +RM = del +CP = copy + +# flags passed to recursive makes in subdirectories + +# subdirectories in the distribution +SUBDIRS = src doc #util + +# default target +all: Makefile $(SUBDIRS) + +$(SUBDIRS): + cd $@ + $(MAKE) + cd .. + +# install everything +install: + echo Just do it. + +clean: clean-recursive clean-top +distclean: distclean-recursive distclean-top +realclean: realclean-recursive realclean-top + +clean-top: + $(RM) *.bak + $(RM) *.zip + +distclean-top: clean-top + $(RM) Makefile + $(RM) config.h + +realclean-top: distclean-top + +clean-recursive distclean-recursive realclean-recursive: + cd src + $(MAKE) $(@:-recursive=) + cd ..\\doc + $(MAKE) $(@:-recursive=) + cd .. + +bindist: wget.zip + +wget.zip: $(SUBDIRS) + $(RM) wget.zip + zip -Djl9 wget.zip AUTHORS COPYING INSTALL MACHINES MAILING-LIST NEWS README DOC\\sample.wgetrc + zip -Dj9 wget.zip SRC\\WGET.EXE DOC\\WGET.HLP + diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/Makefile.watcom wget-1.5.2/windows/Makefile.watcom --- wget-1.5.1/windows/Makefile.watcom Thu Jan 1 02:00:00 1970 +++ wget-1.5.2/windows/Makefile.watcom Sun May 17 03:10:08 1998 @@ -0,0 +1,101 @@ +## Compiler, linker, and lib stuff +## Makefile for use with watcom win95/winnt executable. + +CC=wcc386 +LINK=wlink + +#disabled for faster compiler +LFLAGS=sys nt op st=32767 op version=15013 op map +CFLAGS=/zp4 /d1 /w4 /fpd /5s /fp5 /bm /mf /os /bt=nt /DWINDOWS /DHAVE_CONFIG_H /I=f:\lang\watcom\h;f:\lang\watcom\h\nt;f:\code\wgetb13\src + +## variables +OBJS = FILE ALLOCA.obj,cmpt.obj,connect.obj,fnmatch.obj,ftp.obj,ftp-basic.obj, & + ftp-ls.obj,ftp-opie.obj,getopt.obj,headers.obj,host.obj,html.obj, & + http.obj,init.obj,log.obj,main.obj,md5.obj,netrc.obj,rbuf.obj, & + recur.obj,retr.obj,url.obj,utils.obj,version.obj,mswindows.obj +LINKOBJS = ALLOCA.obj cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj & + ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html.obj & + http.obj init.obj log.obj main.obj md5.obj netrc.obj rbuf.obj & + recur.obj retr.obj url.obj utils.obj version.obj mswindows.obj +LIBFILES = + +BINNAME=wget.exe + +$(BINNAME): $(LINKOBJS) + $(LINK) $(LFLAGS) NAME $(BINNAME) $(OBJS) $(LIBPATH) $(LIBFILES) + +alloca.obj : alloca.c config.h + $(CC) $(CFLAGS) alloca.c + +cmpt.obj : cmpt.c cmpt.h wget.h config.h + $(CC) $(CFLAGS) cmpt.c + +connect.obj : connect.c wget.h connect.h host.h config.h + $(CC) $(CFLAGS) connect.c + +fnmatch.obj : fnmatch.c wget.h fnmatch.h config.h + $(CC) $(CFLAGS) fnmatch.c + +ftp.obj : ftp.c wget.h utils.h url.h rbuf.h retr.h ftp.h html.h connect.h host.h fnmatch.h netrc.h config.h + $(CC) $(CFLAGS) ftp.c + +ftp-basic.obj : ftp-basic.c wget.h utils.h rbuf.h connect.h host.h config.h + $(CC) $(CFLAGS) ftp-basic.c + +ftp-ls.obj : ftp-ls.c wget.h utils.h ftp.h config.h + $(CC) $(CFLAGS) ftp-ls.c + +ftp-opie.obj : ftp-opie.c wget.h md5.h config.h + $(CC) $(CFLAGS) ftp-opie.c + +getopt.obj : getopt.c wget.h getopt.h config.h + $(CC) $(CFLAGS) getopt.c + +headers.obj : headers.c headers.h wget.h rbuf.h connect.h config.h + $(CC) $(CFLAGS) headers.c + +host.obj : host.c wget.h host.h utils.h url.h config.h + $(CC) $(CFLAGS) host.c + +html.obj : html.c wget.h url.h utils.h ftp.h html.h config.h + $(CC) $(CFLAGS) html.c + +http.obj : http.c wget.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h config.h + $(CC) $(CFLAGS) http.c + +init.obj : init.c wget.h utils.h init.h host.h recur.h netrc.h config.h + $(CC) $(CFLAGS) init.c + +log.obj : log.c wget.h utils.h config.h + $(CC) $(CFLAGS) log.c + +main.obj : main.c wget.h utils.h getopt.h init.h retr.h host.h recur.h config.h mswindows.h + $(CC) $(CFLAGS) main.c + +md5.obj : md5.c wget.h md5.h config.h + $(CC) $(CFLAGS) md5.c + +mswindows.obj : mswindows.c wget.h url.h config.h + $(CC) $(CFLAGS) mswindows.c + +netrc.obj : netrc.c wget.h utils.h netrc.h init.h config.h + $(CC) $(CFLAGS) netrc.c + +rbuf.obj : rbuf.c wget.h rbuf.h connect.h config.h + $(CC) $(CFLAGS) rbuf.c + +recur.obj : recur.c wget.h url.h recur.h utils.h retr.h ftp.h fnmatch.h host.h config.h + $(CC) $(CFLAGS) recur.c + +retr.obj : retr.c wget.h utils.h retr.h url.h recur.h ftp.h host.h connect.h config.h + $(CC) $(CFLAGS) retr.c + +url.obj : url.c wget.h url.h host.h html.h utils.h config.h + $(CC) $(CFLAGS) url.c + +utils.obj : utils.c wget.h fnmatch.h utils.h config.h + $(CC) $(CFLAGS) utils.c + +version.obj : version.c config.h + $(CC) $(CFLAGS) version.c + diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/README wget-1.5.2/windows/README --- wget-1.5.1/windows/README Mon Apr 27 21:52:17 1998 +++ wget-1.5.2/windows/README Wed May 6 19:27:19 1998 @@ -6,10 +6,16 @@ available at . This copy of makeinfo is from the miktxt 1.10 archive available from ctan. -Darko Budor did most of the work for the -original port of Wget to Windows. Tim Charron -did most of the work cleaning things up and contributed the watcom -makefile. I made some minor changes and cleaned up the the VC++ -makefile to get a clean build with VC++ 5.0 on Windows 95. +Windows contributors: -John Burden +* Darko Budor -- the initial work on the Windows + port; + +* Tim Charron -- additional cleanup and + contribution of the Watcom makefile; + +* John Burden -- cleanup of the VC++ makefile + to get a clean build with VC++ 5.0 on Windows 95; + +* Douglas E. Wegscheid -- maintains configure.bat and various Windows + makefiles. diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/config.h.bor wget-1.5.2/windows/config.h.bor --- wget-1.5.1/windows/config.h.bor Fri May 1 18:28:37 1998 +++ wget-1.5.2/windows/config.h.bor Fri May 8 05:15:07 1998 @@ -1,5 +1,5 @@ /* Configuration header file. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ #define USE_DIGEST 1 /* Define if you want the debug output support compiled in. */ -#undef DEBUG +#define DEBUG /* Define if you have sys/time.h header. */ #undef HAVE_SYS_TIME_H diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/config.h.ms wget-1.5.2/windows/config.h.ms --- wget-1.5.1/windows/config.h.ms Wed Apr 1 18:04:15 1998 +++ wget-1.5.2/windows/config.h.ms Fri May 8 05:15:26 1998 @@ -1,5 +1,5 @@ /* Configuration header file. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,8 +19,6 @@ #ifndef CONFIG_H #define CONFIG_H -#define DEBUG - /* Define if you have the header file. */ #undef HAVE_ALLOCA_H @@ -68,7 +66,7 @@ #undef ENABLE_NLS /* Define if you want the FTP support for Opie compiled in. */ -#undef USE_OPIE +#define USE_OPIE 1 /* Define if you want the HTTP Digest Authorization compiled in. */ #define USE_DIGEST 1 @@ -113,10 +111,10 @@ #define HAVE_STRSTR 1 /* Define if you have the strcasecmp function. */ -#undef HAVE_STRCASECMP +#define HAVE_STRCASECMP 1 /* Define if you have the strncasecmp function. */ -#undef HAVE_STRNCASECMP +#define HAVE_STRNCASECMP 1 /* Define if you have the strptime function. */ #undef HAVE_STRPTIME diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/makefile.bor wget-1.5.2/windows/makefile.bor --- wget-1.5.1/windows/makefile.bor Fri May 1 18:28:27 1998 +++ wget-1.5.2/windows/makefile.bor Thu Jan 1 02:00:00 1970 @@ -1,106 +0,0 @@ -## Compiler, linker, and lib stuff -## Makefile for use with watcom win95/winnt executable. - -CC=bcc32 -LINK=tlink32 - -LFLAGS= -CFLAGS=-DWINDOWS -DHAVE_CONFIG_H -I. -H -H=wget.csm -w- - -## variables -OBJS=cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj \ - ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html.obj \ - http.obj init.obj log.obj main.obj md5.obj netrc.obj rbuf.obj \ - alloca.obj \ - recur.obj retr.obj url.obj utils.obj version.obj mswindows.obj - -LIBDIR=$(MAKEDIR)\..\lib - -wget.exe: $(OBJS) - $(LINK) @&&| -$(LFLAGS) -Tpe -ap -c + -$(LIBDIR)\c0x32.obj+ -alloca.obj+ -version.obj+ -utils.obj+ -url.obj+ -retr.obj+ -recur.obj+ -rbuf.obj+ -netrc.obj+ -mswindows.obj+ -md5.obj+ -main.obj+ -log.obj+ -init.obj+ -http.obj+ -html.obj+ -host.obj+ -headers.obj+ -getopt.obj+ -ftp-opie.obj+ -ftp-ls.obj+ -ftp-basic.obj+ -ftp.obj+ -fnmatch.obj+ -connect.obj+ -cmpt.obj -$<,$* -$(LIBDIR)\import32.lib+ -$(LIBDIR)\cw32.lib - - - -| - -config.h: ..\windows\config.h.bor - copy $** $< - -cmpt.obj : cmpt.c cmpt.h wget.h config.h - -connect.obj : connect.c wget.h connect.h host.h config.h - -fnmatch.obj : fnmatch.c wget.h fnmatch.h config.h - -ftp.obj : ftp.c wget.h utils.h url.h rbuf.h retr.h ftp.h ftp-basic.h html.h connect.h host.h fnmatch.h netrc.h config.h - -ftp-basic.obj : ftp-basic.c wget.h utils.h rbuf.h ftp-basic.h connect.h host.h config.h - -ftp-ls.obj : ftp-ls.c wget.h utils.h ftp.h config.h - -ftp-opie.obj : ftp-opie.c wget.h md5.h config.h - -getopt.obj : getopt.c wget.h getopt.h config.h - -headers.obj : headers.c headers.h wget.h rbuf.h connect.h config.h - -host.obj : host.c wget.h host.h utils.h url.h config.h - -html.obj : html.c wget.h url.h utils.h ftp.h html.h config.h - -http.obj : http.c wget.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h config.h - -init.obj : init.c wget.h utils.h init.h host.h recur.h netrc.h config.h - -log.obj : log.c wget.h utils.h config.h - -main.obj : main.c wget.h utils.h getopt.h init.h retr.h host.h recur.h config.h mswindows.h - -md5.obj : md5.c wget.h md5.h config.h - -mswindows.obj : mswindows.c wget.h url.h config.h - -netrc.obj : netrc.c wget.h utils.h netrc.h init.h config.h - -rbuf.obj : rbuf.c wget.h rbuf.h connect.h config.h - -recur.obj : recur.c wget.h url.h recur.h utils.h retr.h ftp.h fnmatch.h host.h config.h - -retr.obj : retr.c wget.h utils.h retr.h url.h recur.h ftp.h host.h connect.h config.h - -url.obj : url.c wget.h url.h host.h html.h utils.h config.h - -utils.obj : utils.c wget.h fnmatch.h utils.h config.h - -version.obj : version.c config.h - diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/makefile.watcom wget-1.5.2/windows/makefile.watcom --- wget-1.5.1/windows/makefile.watcom Sat Apr 4 03:18:58 1998 +++ wget-1.5.2/windows/makefile.watcom Thu Jan 1 02:00:00 1970 @@ -1,101 +0,0 @@ -## Compiler, linker, and lib stuff -## Makefile for use with watcom win95/winnt executable. - -CC=wcc386 -LINK=wlink - -#disabled for faster compiler -LFLAGS=sys nt op st=32767 op version=15013 op map -CFLAGS=/zp4 /d1 /w4 /fpd /5s /fp5 /bm /mf /os /bt=nt /DWINDOWS /DHAVE_CONFIG_H /I=f:\lang\watcom\h;f:\lang\watcom\h\nt;f:\code\wgetb13\src - -## variables -OBJS = FILE ALLOCA.obj,cmpt.obj,connect.obj,fnmatch.obj,ftp.obj,ftp-basic.obj, & - ftp-ls.obj,ftp-opie.obj,getopt.obj,headers.obj,host.obj,html.obj, & - http.obj,init.obj,log.obj,main.obj,md5.obj,netrc.obj,rbuf.obj, & - recur.obj,retr.obj,url.obj,utils.obj,version.obj,mswindows.obj -LINKOBJS = ALLOCA.obj cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj & - ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html.obj & - http.obj init.obj log.obj main.obj md5.obj netrc.obj rbuf.obj & - recur.obj retr.obj url.obj utils.obj version.obj mswindows.obj -LIBFILES = - -BINNAME=wget.exe - -$(BINNAME): $(LINKOBJS) - $(LINK) $(LFLAGS) NAME $(BINNAME) $(OBJS) $(LIBPATH) $(LIBFILES) - -alloca.obj : alloca.c config.h - $(CC) $(CFLAGS) alloca.c - -cmpt.obj : cmpt.c cmpt.h wget.h config.h - $(CC) $(CFLAGS) cmpt.c - -connect.obj : connect.c wget.h connect.h host.h config.h - $(CC) $(CFLAGS) connect.c - -fnmatch.obj : fnmatch.c wget.h fnmatch.h config.h - $(CC) $(CFLAGS) fnmatch.c - -ftp.obj : ftp.c wget.h utils.h url.h rbuf.h retr.h ftp.h ftp-basic.h html.h connect.h host.h fnmatch.h netrc.h config.h - $(CC) $(CFLAGS) ftp.c - -ftp-basic.obj : ftp-basic.c wget.h utils.h rbuf.h ftp-basic.h connect.h host.h config.h - $(CC) $(CFLAGS) ftp-basic.c - -ftp-ls.obj : ftp-ls.c wget.h utils.h ftp.h config.h - $(CC) $(CFLAGS) ftp-ls.c - -ftp-opie.obj : ftp-opie.c wget.h md5.h config.h - $(CC) $(CFLAGS) ftp-opie.c - -getopt.obj : getopt.c wget.h getopt.h config.h - $(CC) $(CFLAGS) getopt.c - -headers.obj : headers.c headers.h wget.h rbuf.h connect.h config.h - $(CC) $(CFLAGS) headers.c - -host.obj : host.c wget.h host.h utils.h url.h config.h - $(CC) $(CFLAGS) host.c - -html.obj : html.c wget.h url.h utils.h ftp.h html.h config.h - $(CC) $(CFLAGS) html.c - -http.obj : http.c wget.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h config.h - $(CC) $(CFLAGS) http.c - -init.obj : init.c wget.h utils.h init.h host.h recur.h netrc.h config.h - $(CC) $(CFLAGS) init.c - -log.obj : log.c wget.h utils.h config.h - $(CC) $(CFLAGS) log.c - -main.obj : main.c wget.h utils.h getopt.h init.h retr.h host.h recur.h config.h mswindows.h - $(CC) $(CFLAGS) main.c - -md5.obj : md5.c wget.h md5.h config.h - $(CC) $(CFLAGS) md5.c - -mswindows.obj : mswindows.c wget.h url.h config.h - $(CC) $(CFLAGS) mswindows.c - -netrc.obj : netrc.c wget.h utils.h netrc.h init.h config.h - $(CC) $(CFLAGS) netrc.c - -rbuf.obj : rbuf.c wget.h rbuf.h connect.h config.h - $(CC) $(CFLAGS) rbuf.c - -recur.obj : recur.c wget.h url.h recur.h utils.h retr.h ftp.h fnmatch.h host.h config.h - $(CC) $(CFLAGS) recur.c - -retr.obj : retr.c wget.h utils.h retr.h url.h recur.h ftp.h host.h connect.h config.h - $(CC) $(CFLAGS) retr.c - -url.obj : url.c wget.h url.h host.h html.h utils.h config.h - $(CC) $(CFLAGS) url.c - -utils.obj : utils.c wget.h fnmatch.h utils.h config.h - $(CC) $(CFLAGS) utils.c - -version.obj : version.c config.h - $(CC) $(CFLAGS) version.c - diff -Nru -x TAGS -x *info* -x *.po wget-1.5.1/windows/wget.dep wget-1.5.2/windows/wget.dep --- wget-1.5.1/windows/wget.dep Thu Jan 1 02:00:00 1970 +++ wget-1.5.2/windows/wget.dep Sun May 17 03:09:43 1998 @@ -0,0 +1,25 @@ +alloca$o: alloca.c +ansi2knr$o: ansi2knr.c +cmpt$o: cmpt.c config.h wget.h sysdep.h options.h +connect$o: connect.c config.h wget.h sysdep.h options.h connect.h host.h +fnmatch$o: fnmatch.c config.h wget.h sysdep.h options.h fnmatch.h +ftp-basic$o: ftp-basic.c config.h wget.h sysdep.h options.h utils.h rbuf.h connect.h host.h +ftp-ls$o: ftp-ls.c config.h wget.h sysdep.h options.h utils.h ftp.h rbuf.h +ftp-opie$o: ftp-opie.c config.h wget.h sysdep.h options.h md5.h +ftp$o: ftp.c config.h wget.h sysdep.h options.h utils.h url.h rbuf.h retr.h ftp.h html.h connect.h host.h fnmatch.h netrc.h +getopt$o: getopt.c wget.h sysdep.h options.h getopt.h +headers$o: headers.c config.h wget.h sysdep.h options.h connect.h rbuf.h headers.h +host$o: host.c config.h wget.h sysdep.h options.h utils.h host.h url.h +html$o: html.c config.h wget.h sysdep.h options.h url.h utils.h ftp.h rbuf.h html.h +http$o: http.c config.h wget.h sysdep.h options.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h md5.h +init$o: init.c config.h wget.h sysdep.h options.h utils.h init.h host.h recur.h netrc.h +log$o: log.c config.h wget.h sysdep.h options.h utils.h +main$o: main.c config.h wget.h sysdep.h options.h utils.h getopt.h init.h retr.h rbuf.h recur.h host.h +md5$o: md5.c wget.h sysdep.h options.h md5.h +netrc$o: netrc.c wget.h sysdep.h options.h utils.h netrc.h init.h +rbuf$o: rbuf.c config.h wget.h sysdep.h options.h rbuf.h connect.h +recur$o: recur.c config.h wget.h sysdep.h options.h url.h recur.h utils.h retr.h rbuf.h ftp.h fnmatch.h host.h +retr$o: retr.c config.h wget.h sysdep.h options.h utils.h retr.h rbuf.h url.h recur.h ftp.h host.h connect.h +url$o: url.c config.h wget.h sysdep.h options.h utils.h url.h host.h html.h +utils$o: utils.c config.h wget.h sysdep.h options.h utils.h fnmatch.h +version$o: version.c