X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fftp.c;h=a9ff9437a2f343be1be6bb2f04d539afe87b0eec;hp=a0b22c14945ccdfb0c32aa6552b65ec49f696ce7;hb=462e643a7e31676eceda23e634241f7b4d2cd7bb;hpb=3073a77ed89e7d9527d110a028d134bfd1f9cb40 diff --git a/src/ftp.c b/src/ftp.c index a0b22c14..a9ff9437 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -28,7 +28,7 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#include +#include "wget.h" #include #include @@ -40,7 +40,6 @@ as that of the covered work. */ #include #include -#include "wget.h" #include "utils.h" #include "url.h" #include "retr.h" @@ -52,7 +51,11 @@ as that of the covered work. */ #include "recur.h" /* for INFINITE_RECURSION */ /* File where the "ls -al" listing will be saved. */ +#ifdef MSDOS +#define LIST_FILENAME "_listing" +#else #define LIST_FILENAME ".listing" +#endif typedef struct { @@ -85,11 +88,11 @@ ftp_expected_bytes (const char *s) res = str_to_wgint (s, (char **) &s, 10); if (!*s) return 0; - while (*s && ISSPACE (*s)) + while (*s && c_isspace (*s)) ++s; if (!*s) return 0; - if (TOLOWER (*s) != 'b') + if (c_tolower (*s) != 'b') continue; if (strncasecmp (s, "byte", 4)) continue; @@ -493,7 +496,7 @@ Error in server response, closing control connection.\n")); if (target[0] != '/' && !(con->rs != ST_UNIX - && ISALPHA (target[0]) + && c_isalpha (target[0]) && target[1] == ':') && con->rs != ST_OS400) {