[svn] Fix K&R incompatibilities reported by `gcc -Wtraditional'.

[wget] / src / ftp.c

diff --git a/src/ftp.c b/src/ftp.c
index a95e83897f628870d381037fe047f476ac6a2135..9a77fc108bbd76bcd6ed5229830f6ff033b5fedb 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -220,6 +220,26 @@ ftp_do_port (int csock, int *local_sock)
 }
 #endif
 
+static void
+print_length (wgint size, wgint start, int authoritative)
+{
+  logprintf (LOG_VERBOSE, _("Length: %s"), with_thousand_seps (size));
+  if (size >= 1024)
+    logprintf (LOG_VERBOSE, " (%s)", human_readable (size));
+  if (start > 0)
+    {
+      if (start >= 1024)
+       logprintf (LOG_VERBOSE, _(", %s (%s) remaining"),
+                  with_thousand_seps (size - start),
+                  human_readable (size - start));
+      else
+       logprintf (LOG_VERBOSE, _(", %s remaining"),
+                  with_thousand_seps (size - start));
+    }
+  if (!authoritative)
+    logputs (LOG_VERBOSE, _(" (unauthoritative)\n"));
+}
+
 /* Retrieves a file with denoted parameters through opening an FTP
    connection to the server.  It always closes the data connection,
    and closes the control connection in case of error.  */
@@ -233,7 +253,7 @@ getftp (struct url *u, wgint *len, wgint restval, ccon *con)
   char *tms, *tmrate;
   int cmd = con->cmd;
   int pasv_mode_open = 0;
-  wgint expected_bytes = 0L;
+  wgint expected_bytes = 0;
   int rest_failed = 0;
   int flags;
   wgint rd_size;
@@ -251,9 +271,10 @@ getftp (struct url *u, wgint *len, wgint restval, ccon *con)
   user = u->user;
   passwd = u->passwd;
   search_netrc (u->host, (const char **)&user, (const char **)&passwd, 1);
-  user = user ? user : opt.ftp_acc;
-  passwd = passwd ? passwd : opt.ftp_pass;
-  assert (user && passwd);
+  user = user ? user : (opt.ftp_user ? opt.ftp_user : opt.user);
+  if (!user) user = "anonymous";
+  passwd = passwd ? passwd : (opt.ftp_passwd ? opt.ftp_passwd : opt.passwd);
+  if (!passwd) passwd = "-wget@";
 
   dtsock = -1;
   local_sock = -1;
@@ -271,8 +292,7 @@ getftp (struct url *u, wgint *len, wgint restval, ccon *con)
       if (con->proxy)
        {
          /* If proxy is in use, log in as username@target-site. */
-         logname = xmalloc (strlen (user) + 1 + strlen (u->host) + 1);
-         sprintf (logname, "%s@%s", user, u->host);
+         logname = concat_strings (user, "@", u->host, (char *) 0);
        }
 
       /* Login to the server: */
@@ -310,14 +330,12 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case FTPSRVERR:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET, _("Error in server greeting.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case WRITEFAILED:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET,
@@ -325,29 +343,24 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case FTPLOGREFUSED:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET, _("The server refuses login.\n"));
          fd_close (csock);
          con->csock = -1;
          return FTPLOGREFUSED;
-         break;
        case FTPLOGINC:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET, _("Login incorrect.\n"));
          fd_close (csock);
          con->csock = -1;
          return FTPLOGINC;
-         break;
        case FTPOK:
          if (!opt.server_response)
            logputs (LOG_VERBOSE, _("Logged in!\n"));
          break;
        default:
          abort ();
-         exit (1);
-         break;
        }
       /* Third: Get the system type */
       if (!opt.server_response)
@@ -363,7 +376,6 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case FTPSRVERR:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET,
@@ -374,7 +386,6 @@ Error in server response, closing control connection.\n"));
          break;
        default:
          abort ();
-         break;
        }
       if (!opt.server_response && err != FTPSRVERR)
        logputs (LOG_VERBOSE, _("done.    "));
@@ -394,7 +405,6 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case FTPSRVERR :
          /* PWD unsupported -- assume "/". */
          xfree_null (con->id);
@@ -405,7 +415,6 @@ Error in server response, closing control connection.\n"));
          break;
        default:
          abort ();
-         break;
        }
       /* VMS will report something like "PUB$DEVICE:[INITIAL.FOLDER]".
          Convert it to "/INITIAL/FOLDER" */ 
@@ -448,7 +457,6 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case WRITEFAILED:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET,
@@ -456,7 +464,6 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case FTPUNKNOWNTYPE:
          logputs (LOG_VERBOSE, "\n");
          logprintf (LOG_NOTQUIET,
@@ -470,7 +477,6 @@ Error in server response, closing control connection.\n"));
          break;
        default:
          abort ();
-         break;
        }
       if (!opt.server_response)
        logputs (LOG_VERBOSE, _("done.  "));
@@ -563,7 +569,6 @@ Error in server response, closing control connection.\n"));
              fd_close (csock);
              con->csock = -1;
              return err;
-             break;
            case WRITEFAILED:
              logputs (LOG_VERBOSE, "\n");
              logputs (LOG_NOTQUIET,
@@ -571,7 +576,6 @@ Error in server response, closing control connection.\n"));
              fd_close (csock);
              con->csock = -1;
              return err;
-             break;
            case FTPNSFOD:
              logputs (LOG_VERBOSE, "\n");
              logprintf (LOG_NOTQUIET, _("No such directory `%s'.\n\n"),
@@ -579,13 +583,10 @@ Error in server response, closing control connection.\n"));
              fd_close (csock);
              con->csock = -1;
              return err;
-             break;
            case FTPOK:
-             /* fine and dandy */
              break;
            default:
              abort ();
-             break;
            }
          if (!opt.server_response)
            logputs (LOG_VERBOSE, _("done.\n"));
@@ -614,13 +615,11 @@ Error in server response, closing control connection.\n"));
          fd_close (csock);
          con->csock = -1;
          return err;
-         break;
        case FTPOK:
          /* Everything is OK.  */
          break;
        default:
          abort ();
-         break;
        }
        if (!opt.server_response)
          logputs (LOG_VERBOSE, _("done.\n"));
@@ -644,7 +643,6 @@ Error in server response, closing control connection.\n"));
              fd_close (csock);
              con->csock = -1;
              return err;
-             break;
            case WRITEFAILED:
              logputs (LOG_VERBOSE, "\n");
              logputs (LOG_NOTQUIET,
@@ -652,7 +650,6 @@ Error in server response, closing control connection.\n"));
              fd_close (csock);
              con->csock = -1;
              return err;
-             break;
            case FTPNOPASV:
              logputs (LOG_VERBOSE, "\n");
              logputs (LOG_NOTQUIET, _("Cannot initiate PASV transfer.\n"));
@@ -662,11 +659,9 @@ Error in server response, closing control connection.\n"));
              logputs (LOG_NOTQUIET, _("Cannot parse PASV response.\n"));
              break;
            case FTPOK:
-             /* fine and dandy */
              break;
            default:
              abort ();
-             break;
            }   /* switch (err) */
          if (err==FTPOK)
            {
@@ -708,7 +703,6 @@ Error in server response, closing control connection.\n"));
              fd_close (dtsock);
              fd_close (local_sock);
              return err;
-             break;
            case WRITEFAILED:
              logputs (LOG_VERBOSE, "\n");
              logputs (LOG_NOTQUIET,
@@ -718,7 +712,6 @@ Error in server response, closing control connection.\n"));
              fd_close (dtsock);
              fd_close (local_sock);
              return err;
-             break;
            case CONSOCKERR:
              logputs (LOG_VERBOSE, "\n");
              logprintf (LOG_NOTQUIET, "socket: %s\n", strerror (errno));
@@ -727,14 +720,12 @@ Error in server response, closing control connection.\n"));
              fd_close (dtsock);
              fd_close (local_sock);
              return err;
-             break;
            case FTPSYSERR:
              logputs (LOG_VERBOSE, "\n");
              logprintf (LOG_NOTQUIET, _("Bind error (%s).\n"),
                         strerror (errno));
              fd_close (dtsock);
              return err;
-             break;
            case FTPPORTERR:
              logputs (LOG_VERBOSE, "\n");
              logputs (LOG_NOTQUIET, _("Invalid PORT.\n"));
@@ -743,13 +734,10 @@ Error in server response, closing control connection.\n"));
              fd_close (dtsock);
              fd_close (local_sock);
              return err;
-             break;
            case FTPOK:
-             /* fine and dandy */
              break;
            default:
              abort ();
-             break;
            } /* port switch */
          if (!opt.server_response)
            logputs (LOG_VERBOSE, _("done.    "));
@@ -776,7 +764,6 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case WRITEFAILED:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET,
@@ -786,17 +773,14 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case FTPRESTFAIL:
          logputs (LOG_VERBOSE, _("\nREST failed, starting from scratch.\n"));
          rest_failed = 1;
          break;
        case FTPOK:
-         /* fine and dandy */
          break;
        default:
          abort ();
-         break;
        }
       if (err != FTPRESTFAIL && !opt.server_response)
        logputs (LOG_VERBOSE, _("done.    "));
@@ -840,7 +824,6 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case WRITEFAILED:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET,
@@ -850,7 +833,6 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case FTPNSFOD:
          logputs (LOG_VERBOSE, "\n");
          logprintf (LOG_NOTQUIET, _("No such file `%s'.\n\n"),
@@ -858,13 +840,10 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case FTPOK:
-         /* fine and dandy */
          break;
        default:
          abort ();
-         break;
        }
 
       if (!opt.server_response)
@@ -892,7 +871,6 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case WRITEFAILED:
          logputs (LOG_VERBOSE, "\n");
          logputs (LOG_NOTQUIET,
@@ -902,7 +880,6 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case FTPNSFOD:
          logputs (LOG_VERBOSE, "\n");
          logprintf (LOG_NOTQUIET, _("No such file or directory `%s'.\n\n"),
@@ -910,13 +887,10 @@ Error in server response, closing control connection.\n"));
          fd_close (dtsock);
          fd_close (local_sock);
          return err;
-         break;
        case FTPOK:
-         /* fine and dandy */
          break;
        default:
          abort ();
-         break;
        }
       if (!opt.server_response)
        logputs (LOG_VERBOSE, _("done.\n"));
@@ -963,7 +937,7 @@ Error in server response, closing control connection.\n"));
        fp = fopen (con->target, "wb");
       else
        {
-         fp = fopen_excl (con->target, 0);
+         fp = fopen_excl (con->target, 1);
          if (!fp && errno == EEXIST)
            {
              /* We cannot just invent a new name and use it (which is
@@ -994,20 +968,11 @@ Error in server response, closing control connection.\n"));
 
   if (*len)
     {
-      logprintf (LOG_VERBOSE, _("Length: %s"), legible (*len));
-      if (restval)
-       logprintf (LOG_VERBOSE, _(" [%s to go]"), legible (*len - restval));
-      logputs (LOG_VERBOSE, "\n");
+      print_length (*len, restval, 1);
       expected_bytes = *len;   /* for get_contents/show_progress */
     }
   else if (expected_bytes)
-    {
-      logprintf (LOG_VERBOSE, _("Length: %s"), legible (expected_bytes));
-      if (restval)
-       logprintf (LOG_VERBOSE, _(" [%s to go]"),
-                  legible (expected_bytes - restval));
-      logputs (LOG_VERBOSE, _(" (unauthoritative)\n"));
-    }
+    print_length (expected_bytes, restval, 0);
 
   /* Get the contents of the document.  */
   flags = 0;
@@ -1237,7 +1202,6 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
        case FTPNSFOD: case FTPLOGINC: case FTPNOPASV: case CONTNOTSUPPORTED:
          /* Fatal errors, give up.  */
          return err;
-         break;
        case CONSOCKERR: case CONERROR: case FTPSRVERR: case FTPRERR:
        case WRITEFAILED: case FTPUNKNOWNTYPE: case FTPSYSERR:
        case FTPPORTERR: case FTPLOGREFUSED: case FTPINVPASV:
@@ -1252,7 +1216,6 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
              locf = con->target;
            }
          continue;
-         break;
        case FTPRETRINT:
          /* If the control connection was closed, the retrieval
             will be considered OK if f->size == len.  */
@@ -1323,8 +1286,8 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
 
          if (opt.delete_after)
            {
-             DEBUGP (("Removing file due to --delete-after in"
-                      " ftp_loop_internal():\n"));
+             DEBUGP (("\
+Removing file due to --delete-after in ftp_loop_internal():\n"));
              logprintf (LOG_VERBOSE, _("Removing %s.\n"), locf);
              if (unlink (locf))
                logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
@@ -1691,7 +1654,7 @@ Not descending to `%s' as it is excluded/not-included.\n"),
       odir = xstrdup (u->dir); /* because url_set_dir will free
                                   u->dir. */
       url_set_dir (u, newdir);
-      ftp_retrieve_glob (u, con, GETALL);
+      ftp_retrieve_glob (u, con, GLOB_GETALL);
       url_set_dir (u, odir);
       xfree (odir);
 
@@ -1722,9 +1685,10 @@ has_insecure_name_p (const char *s)
    Then it weeds out the file names that do not match the pattern.
    ftp_retrieve_list is called with this updated list as an argument.
 
-   If the argument ACTION is GETONE, just download the file (but first
-   get the listing, so that the time-stamp is heeded); if it's GLOBALL,
-   use globbing; if it's GETALL, download the whole directory.  */
+   If the argument ACTION is GLOB_GETONE, just download the file (but
+   first get the listing, so that the time-stamp is heeded); if it's
+   GLOB_GLOBALL, use globbing; if it's GLOB_GETALL, download the whole
+   directory.  */
 static uerr_t
 ftp_retrieve_glob (struct url *u, ccon *con, int action)
 {
@@ -1768,7 +1732,7 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action)
     }
   /* Now weed out the files that do not match our globbing pattern.
      If we are dealing with a globbing pattern, that is.  */
-  if (*u->file && (action == GLOBALL || action == GETONE))
+  if (*u->file && (action == GLOB_GLOBALL || action == GLOB_GETONE))
     {
       int matchres = 0;
 
@@ -1800,7 +1764,7 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action)
     }
   else if (!start)
     {
-      if (action == GLOBALL)
+      if (action == GLOB_GLOBALL)
        {
          /* No luck.  */
          /* #### This message SUCKS.  We should see what was the
@@ -1808,7 +1772,7 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action)
          logprintf (LOG_VERBOSE, _("No matches on pattern `%s'.\n"),
                     escnonprint (u->file));
        }
-      else /* GETONE or GETALL */
+      else /* GLOB_GETONE or GLOB_GETALL */
        {
          /* Let's try retrieving it anyway.  */
          con->st |= ON_YOUR_OWN;
@@ -1835,7 +1799,7 @@ ftp_loop (struct url *u, int *dt, struct url *proxy)
 
   *dt = 0;
 
-  memset (&con, 0, sizeof (con));
+  xzero (con);
 
   con.csock = -1;
   con.st = ON_YOUR_OWN;
@@ -1893,7 +1857,8 @@ ftp_loop (struct url *u, int *dt, struct url *proxy)
             if we need globbing, time-stamping or recursion.  Its
             third argument is just what we really need.  */
          res = ftp_retrieve_glob (u, &con,
-                                  (opt.ftp_glob && wild) ? GLOBALL : GETONE);
+                                  (opt.ftp_glob && wild)
+                                  ? GLOB_GLOBALL : GLOB_GETONE);
        }
       else
        res = ftp_loop_internal (u, NULL, &con);