httpd: trivial simplification

[oweals/busybox.git] / networking / ftpgetput.c

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 02e7c52707f3fc1af8652f4af52d771daaf7bced..58847a9f2b7a48ed396bf37fd3889265473ab492 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -5,7 +5,7 @@
  * Mini implementation of FTP to retrieve a remote file.
  *
  * Copyright (C) 2002 Jeff Angielski, The PTR Group <jeff@theptrgroup.com>
- * Copyright (C) 2002 Glenn McGrath <bug1@iinet.net.au>
+ * Copyright (C) 2002 Glenn McGrath
  *
  * Based on wget.c by Chip Rosenthal Covad Communications
  * <chip@laserlink.net>
@@ -287,7 +287,7 @@ int ftp_send(ftp_host_info_t *server, FILE *control_stream,
 #define FTPGETPUT_OPT_PORT     16
 
 #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
-static const char ftpgetput_longopts[] =
+static const char ftpgetput_longopts[] ALIGN1 =
        "continue\0" Required_argument "c"
        "verbose\0"  No_argument       "v"
        "username\0" Required_argument "u"
@@ -331,7 +331,7 @@ int ftpgetput_main(int argc, char **argv)
        applet_long_options = ftpgetput_longopts;
 #endif
        opt_complementary = "=3"; /* must have 3 params */
-       opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
+       opt = getopt32(argv, "cvu:p:P:", &server->user, &server->password, &port);
        argv += optind;
 
        /* Process the non-option command line arguments */
@@ -348,7 +348,7 @@ int ftpgetput_main(int argc, char **argv)
        server->lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21));
        if (verbose_flag) {
                printf("Connecting to %s (%s)\n", argv[0],
-                       xmalloc_sockaddr2dotted(&server->lsa->sa, server->lsa->len));
+                       xmalloc_sockaddr2dotted(&server->lsa->sa));
        }
 
        /*  Connect/Setup/Configure the FTP session */