wget: add TODO

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

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 978601d26d57f34cb9c4fb830b918a5b2edd8b5a..739a44155ef42e32b62ebd057b8bcb51440696b7 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -42,15 +42,15 @@ static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf)
                char *buf_ptr;
 
                if (fgets(buf, 510, stream) == NULL) {
-                       bb_perror_msg_and_die("fgets()");
+                       bb_perror_msg_and_die("fgets");
                }
                buf_ptr = strstr(buf, "\r\n");
                if (buf_ptr) {
                        *buf_ptr = '\0';
                }
-       } while (! isdigit(buf[0]) || buf[3] != ' ');
+       } while (!isdigit(buf[0]) || buf[3] != ' ');
 
-       return atoi(buf);
+       return xatou(buf);
 }
 
 static int xconnect_ftpdata(ftp_host_info_t *server, const char *buf)
@@ -60,14 +60,14 @@ static int xconnect_ftpdata(ftp_host_info_t *server, const char *buf)
 
        buf_ptr = strrchr(buf, ',');
        *buf_ptr = '\0';
-       port_num = atoi(buf_ptr + 1);
+       port_num = xatoul_range(buf_ptr + 1, 0, 255);
 
        buf_ptr = strrchr(buf, ',');
        *buf_ptr = '\0';
-       port_num += atoi(buf_ptr + 1) * 256;
+       port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
 
-       server->s_in->sin_port=htons(port_num);
-       return(xconnect(server->s_in));
+       server->s_in->sin_port = htons(port_num);
+       return xconnect_tcp_v4(server->s_in);
 }
 
 static FILE *ftp_login(ftp_host_info_t *server)
@@ -76,9 +76,9 @@ static FILE *ftp_login(ftp_host_info_t *server)
        char buf[512];
 
        /* Connect to the command socket */
-       control_stream = fdopen(xconnect(server->s_in), "r+");
+       control_stream = fdopen(xconnect_tcp_v4(server->s_in), "r+");
        if (control_stream == NULL) {
-               bb_perror_msg_and_die("Couldnt open control stream");
+               bb_perror_msg_and_die("cannot open control stream");
        }
 
        if (ftpcmd(NULL, NULL, control_stream, buf) != 220) {
@@ -104,9 +104,11 @@ static FILE *ftp_login(ftp_host_info_t *server)
 }
 
 #if !ENABLE_FTPGET
-#define ftp_receive 0
+int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
+               const char *local_path, char *server_path);
 #else
-static int ftp_receive(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];
@@ -122,10 +124,8 @@ static int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
        fd_data = xconnect_ftpdata(server, buf);
 
        if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) {
-               unsigned long value=filesize;
-               if (safe_strtoul(buf + 4, &value))
+               if (SAFE_STRTOOFF(buf + 4, &filesize))
                        bb_error_msg_and_die("SIZE error: %s", buf + 4);
-               filesize = value;
        } else {
                filesize = -1;
                do_continue = 0;
@@ -139,7 +139,7 @@ static int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
        if (do_continue) {
                struct stat sbuf;
                if (lstat(local_path, &sbuf) < 0) {
-                       bb_perror_msg_and_die("fstat()");
+                       bb_perror_msg_and_die("lstat");
                }
                if (sbuf.st_size > 0) {
                        beg_range = sbuf.st_size;
@@ -149,7 +149,7 @@ static int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
        }
 
        if (do_continue) {
-               sprintf(buf, "REST %ld", (long)beg_range);
+               sprintf(buf, "REST %"OFF_FMT, beg_range);
                if (ftpcmd(buf, NULL, control_stream, buf) != 350) {
                        do_continue = 0;
                } else {
@@ -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 = xopen3(local_path, O_CREAT | O_TRUNC | O_WRONLY, 777);
+                       fd_local = xopen3(local_path, O_CREAT | O_TRUNC | O_WRONLY, 0666);
                }
        }
 
@@ -191,9 +191,11 @@ static int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
 #endif
 
 #if !ENABLE_FTPPUT
-#define ftp_send 0
+int ftp_send(ftp_host_info_t *server, FILE *control_stream,
+               const char *server_path, char *local_path);
 #else
-static int ftp_send(ftp_host_info_t *server, FILE *control_stream,
+static
+int ftp_send(ftp_host_info_t *server, FILE *control_stream,
                const char *server_path, char *local_path)
 {
        struct stat sbuf;
@@ -275,7 +277,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 +290,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 +307,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) {