Updated config.guess, config.sub, install.sh.

[wget] / src / ftp-basic.c

diff --git a/src/ftp-basic.c b/src/ftp-basic.c
index 1dcdfc633bb9e9f1fdebe1a91ba9266c1a5b9087..8d3342c0c73acee808bbd48215871d5978d470dd 100644 (file)
--- a/src/ftp-basic.c
+++ b/src/ftp-basic.c
@@ -68,7 +68,7 @@ ftp_response (int fd, char **ret_line)
         return FTPRERR;
 
       /* Strip trailing CRLF before printing the line, so that
-         escnonprint doesn't include bogus \012 and \015. */
+         quotting doesn't include bogus \012 and \015. */
       p = strchr (line, '\0');
       if (p > line && p[-1] == '\n')
         *--p = '\0';
@@ -76,9 +76,10 @@ ftp_response (int fd, char **ret_line)
         *--p = '\0';
 
       if (opt.server_response)
-        logprintf (LOG_NOTQUIET, "%s\n", escnonprint (line));
+        logprintf (LOG_NOTQUIET, "%s\n", 
+                   quotearg_style (escape_quoting_style, line));
       else
-        DEBUGP (("%s\n", escnonprint (line)));
+        DEBUGP (("%s\n", quotearg_style (escape_quoting_style, line)));
 
       /* The last line of output is the one that begins with "ddd ". */
       if (c_isdigit (line[0]) && c_isdigit (line[1]) && c_isdigit (line[2])
@@ -116,7 +117,8 @@ ftp_request (const char *command, const char *value)
             if (*p == '\r' || *p == '\n')
               *p = ' ';
           DEBUGP (("\nDetected newlines in %s \"%s\"; changing to %s \"%s\"\n",
-                   command, escnonprint (value), command, escnonprint (defanged)));
+                   command, quotearg_style (escape_quoting_style, value), 
+                   command, quotearg_style (escape_quoting_style, defanged)));
           /* Make VALUE point to the defanged copy of the string. */
           value = defanged;
         }
@@ -187,7 +189,7 @@ ftp_login (int csock, const char *acc, const char *pass)
       "331 s/key ",
       "331 opiekey "
     };
-    int i;
+    size_t i;
     const char *seed = NULL;
 
     for (i = 0; i < countof (skey_head); i++)
@@ -887,42 +889,6 @@ ftp_cwd (int csock, const char *dir)
   return FTPOK;
 }
 
-/* Sends DELE command to the FTP server.  */
-uerr_t
-ftp_dele (int csock, const char *file)
-{
-  char *request, *respline;
-  int nwritten;
-  uerr_t err;
-
-  /* Send DELE request.  */
-  request = ftp_request ("DELE", file);
-  nwritten = fd_write (csock, request, strlen (request), -1.0);
-  if (nwritten < 0)
-    {
-      xfree (request);
-      return WRITEFAILED;
-    }
-  xfree (request);
-  /* Get appropriate response.  */
-  err = ftp_response (csock, &respline);
-  if (err != FTPOK)
-    return err;                 /* Return with early bad status. */
-
-  /* All OK, so far.  */
-  if (*respline == '5')
-    {
-      err = FTPNSFOD;           /* Permanent Negative Completion. */
-    }
-  else if (*respline != '2')    /* Success might be 226 or 250 (or ???). */
-    {
-      err = FTPRERR;            /* Not Positive Completion. */
-    }
-
-  xfree (respline);             /* Free "respline" storage. */
-  return err;                   /* Return response-based status code. */
-}
-
 /* Sends REST command to the FTP server.  */
 uerr_t
 ftp_rest (int csock, wgint offset)
@@ -998,7 +964,7 @@ ftp_list (int csock, const char *file, enum stype rs)
   int nwritten;
   uerr_t err;
   bool ok = false;
-  int i = 0;
+  size_t i = 0;
   /* Try `LIST -a' first and revert to `LIST' in case of failure.  */
   const char *list_commands[] = { "LIST -a", 
                                   "LIST" };