wget,ftpd: shorten and reuse strings

function                                             old     new   delta
wget_main                                           2382    2386      +4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 4/0)                 Total: 4 bytes
   text	   data	    bss	    dec	    hex	filename
 934228	    477	   7296	 942001	  e5fb1	busybox_old
 934202	    477	   7296	 941975	  e5f97	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/ftpd.c b/networking/ftpd.c
index 8abbf7f578de844356e7954de97271755213941f..e289a60517156d52c59f8f4bcf946719760b937d 100644 (file)
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1263,7 +1263,7 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
                                        break; /* does not even ask for password */
                        }
                        pw = getpwnam(G.ftp_arg);
-                       cmdio_write_raw(STR(FTP_GIVEPWORD)" Please specify password\r\n");
+                       cmdio_write_raw(STR(FTP_GIVEPWORD)" Specify password\r\n");
                } else if (cmdval == const_PASS) {
                        if (check_password(pw, G.ftp_arg) > 0) {
                                break;  /* login success */
@@ -1274,7 +1274,7 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
                        WRITE_OK(FTP_GOODBYE);
                        return 0;
                } else {
-                       cmdio_write_raw(STR(FTP_LOGINERR)" Login with USER and PASS\r\n");
+                       cmdio_write_raw(STR(FTP_LOGINERR)" Login with USER+PASS\r\n");
                }
        }
        WRITE_OK(FTP_LOGINOK);

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index cdad629da10a87bbe0ef06cf9cd2b2ca9495a27c..2f2921366812859fa3241255c42f93d02ea57159 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -309,7 +309,7 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
        /* Set default values */
        user = "anonymous";
-       password = "busybox@";
+       password = "busybox";
 
        /*
         * Decipher the command line

diff --git a/networking/wget.c b/networking/wget.c
index 12ee29a6fc23e6b2fac70c790a97648bff6967d6..c9e576e697ba0df2cf26b0d24bac0214ced179e2 100644 (file)
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -762,12 +762,9 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
 static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_sockaddr *lsa)
 {
        FILE *sfp;
-       char *str;
+       char *pass;
        int port;
 
-       if (!target->user)
-               target->user = xstrdup("anonymous:busybox@");
-
        sfp = open_socket(lsa);
 #if ENABLE_FEATURE_WGET_HTTPS
        if (target->protocol == P_FTPS)
@@ -778,18 +775,20 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
                bb_error_msg_and_die("%s", G.wget_buf);
                /* note: ftpcmd() sanitizes G.wget_buf, ok to print */
 
-       /*
-        * Splitting username:password pair,
-        * trying to log in
-        */
-       str = strchr(target->user, ':');
-       if (str)
-               *str++ = '\0';
-       switch (ftpcmd("USER ", target->user, sfp)) {
+       /* Split username:password pair */
+       pass = (char*)"busybox"; /* password for "anonymous" */
+       if (target->user) {
+               pass = strchr(target->user, ':');
+               if (pass)
+                       *pass++ = '\0';
+       }
+
+       /* Log in */
+       switch (ftpcmd("USER ", target->user ?: "anonymous", sfp)) {
        case 230:
                break;
        case 331:
-               if (ftpcmd("PASS ", str, sfp) == 230)
+               if (ftpcmd("PASS ", pass, sfp) == 230)
                        break;
                /* fall through (failed login) */
        default:
@@ -798,9 +797,7 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
 
        ftpcmd("TYPE I", NULL, sfp);
 
-       /*
-        * Querying file size
-        */
+       /* Query file size */
        if (ftpcmd("SIZE ", target->path, sfp) == 213) {
                G.content_len = BB_STRTOOFF(G.wget_buf + 4, NULL, 10);
                if (G.content_len < 0 || errno) {
@@ -809,9 +806,7 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
                G.got_clen = 1;
        }
 
-       /*
-        * Entering passive mode
-        */
+       /* Enter passive mode */
        if (ENABLE_FEATURE_IPV6 && ftpcmd("EPSV", NULL, sfp) == 229) {
                /* good */
        } else