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 4be49c5a958ee343eda4a6dc2f5b240f35cb05e0..4928541530bfa3ca981feedb8f03fcc7c2f98e0a 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,19 +13,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/ioctl.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/socket.h>
-
 #include "busybox.h"
+#include <getopt.h>
 
 typedef struct ftp_host_info_s {
        char *user;
@@ -117,7 +106,7 @@ static FILE *ftp_login(ftp_host_info_t *server)
 #if !ENABLE_FTPGET
 #define ftp_receive 0
 #else
-static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream,
+static int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
                const char *local_path, char *server_path)
 {
        char buf[512];
@@ -175,9 +164,9 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream,
        /* only make a local file if we know that one exists on the remote server */
        if (fd_local == -1) {
                if (do_continue) {
-                       fd_local = bb_xopen(local_path, O_APPEND | O_WRONLY);
+                       fd_local = xopen(local_path, O_APPEND | O_WRONLY);
                } else {
-                       fd_local = bb_xopen(local_path, O_CREAT | O_TRUNC | O_WRONLY);
+                       fd_local = xopen3(local_path, O_CREAT | O_TRUNC | O_WRONLY, 0777);
                }
        }
 
@@ -223,7 +212,7 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream,
        if ((local_path[0] == '-') && (local_path[1] == '\0')) {
                fd_local = STDIN_FILENO;
        } else {
-               fd_local = bb_xopen(local_path, O_RDONLY);
+               fd_local = xopen(local_path, O_RDONLY);
                fstat(fd_local, &sbuf);
 
                sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size);
@@ -286,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 */
@@ -299,11 +288,11 @@ 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')) {
-               ftp_action = ftp_recieve;
+       if (ENABLE_FTPGET && (!ENABLE_FTPPUT || applet_name[3] == 'g')) {
+               ftp_action = ftp_receive;
        }
 
        /* Set default values */
@@ -316,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) {