wget: don't be careless with xstrdup'ing

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

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 767ace9fb8a74ea5f655cdc02bbf6be61820cafc..4928541530bfa3ca981feedb8f03fcc7c2f98e0a 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -166,7 +166,7 @@ static int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
                if (do_continue) {
                        fd_local = xopen(local_path, O_APPEND | O_WRONLY);
                } else {
-                       fd_local = xopen(local_path, O_CREAT | O_TRUNC | O_WRONLY);
+                       fd_local = xopen3(local_path, O_CREAT | O_TRUNC | O_WRONLY, 0777);
                }
        }
 
@@ -275,7 +275,7 @@ static const struct option ftpgetput_long_options[] = {
 int ftpgetput_main(int argc, char **argv)
 {
        /* content-length of the file */
-       unsigned long opt;
+       unsigned opt;
        char *port = "ftp";
 
        /* socket to ftp server */
@@ -288,10 +288,10 @@ int ftpgetput_main(int argc, char **argv)
        int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = NULL;
 
        /* Check to see if the command is ftpget or ftput */
-       if (ENABLE_FTPPUT && (!ENABLE_FTPGET || bb_applet_name[3] == 'p')) {
+       if (ENABLE_FTPPUT && (!ENABLE_FTPGET || applet_name[3] == 'p')) {
                ftp_action = ftp_send;
        }
-       if (ENABLE_FTPGET && (!ENABLE_FTPPUT || bb_applet_name[3] == 'g')) {
+       if (ENABLE_FTPGET && (!ENABLE_FTPPUT || applet_name[3] == 'g')) {
                ftp_action = ftp_receive;
        }
 
@@ -305,9 +305,9 @@ int ftpgetput_main(int argc, char **argv)
         * Decipher the command line
         */
        if (ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS)
-               bb_applet_long_options = ftpgetput_long_options;
+               applet_long_options = ftpgetput_long_options;
 
-       opt = bb_getopt_ulflags(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
+       opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
 
        /* Process the non-option command line arguments */
        if (argc - optind != 3) {