ISSPACE -> c_isspace

[wget] / src / ftp.c

diff --git a/src/ftp.c b/src/ftp.c
index 7da68afa7038e019224f941ca3eef45b9eefbbbc..302714afda99cd78bd0187ca7b8b8051d66f669c 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1,5 +1,6 @@
 /* File Transfer Protocol support.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -50,7 +51,11 @@ so, delete this exception statement from your version.  */
 #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
 {
@@ -83,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;
@@ -491,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)
             {
@@ -967,7 +972,7 @@ Error in server response, closing control connection.\n"));
                       expected_bytes ? expected_bytes - restval : 0,
                       restval, &rd_size, len, &con->dltime, flags);
 
-  tms = time_str (time (NULL));
+  tms = datetime_str (time (NULL));
   tmrate = retr_rate (rd_size, con->dltime);
   total_download_time += con->dltime;
 
@@ -1149,7 +1154,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
         restval = 0;
 
       /* Get the current time string.  */
-      tms = time_str (time (NULL));
+      tms = datetime_str (time (NULL));
       /* Print fetch message, if opt.verbose.  */
       if (opt.verbose)
         {
@@ -1213,7 +1218,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
           /* Not as great.  */
           abort ();
         }
-      tms = time_str (time (NULL));
+      tms = datetime_str (time (NULL));
       if (!opt.spider)
         tmrate = retr_rate (len - restval, con->dltime);