Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/ftpgetput.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/ftpgetput.c (modified) (6 diffs)

branches/3.2/mindi-busybox/networking/ftpgetput.c

@@ -14 +14 @@
  */
 
+//usage:#define ftpget_trivial_usage
+//usage:       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
+//usage:#define ftpget_full_usage "\n\n"
+//usage:       "Download a file via FTP\n"
+//usage:    IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -c,--continue       Continue previous transfer"
+//usage:     "\n    -v,--verbose        Verbose"
+//usage:     "\n    -u,--username USER  Username"
+//usage:     "\n    -p,--password PASS  Password"
+//usage:     "\n    -P,--port NUM       Port"
+//usage:    )
+//usage:    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -c  Continue previous transfer"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -u USER Username"
+//usage:     "\n    -p PASS Password"
+//usage:     "\n    -P NUM  Port"
+//usage:    )
+//usage:
+//usage:#define ftpput_trivial_usage
+//usage:       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
+//usage:#define ftpput_full_usage "\n\n"
+//usage:       "Upload a file to a FTP server\n"
+//usage:    IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -v,--verbose        Verbose"
+//usage:     "\n    -u,--username USER  Username"
+//usage:     "\n    -p,--password PASS  Password"
+//usage:     "\n    -P,--port NUM       Port"
+//usage:    )
+//usage:    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -u USER Username"
+//usage:     "\n    -p PASS Password"
+//usage:     "\n    -P NUM  Port number"
+//usage:    )
+
 #include "libbb.h"
 
@@ -23 +59 @@
     int verbose_flag;
     int do_continue;
-    char buf[1]; /* actually [BUFSZ] */
+    char buf[4]; /* actually [BUFSZ] */
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
@@ -68 +104 @@
 
     do {
-        strcpy(buf, "EOF");
+        strcpy(buf, "EOF"); /* for ftp_die */
         if (fgets(buf, BUFSZ - 2, control_stream) == NULL) {
             ftp_die(NULL);
@@ -152 +188 @@
     port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
 
-    set_nport(lsa, htons(port_num));
+    set_nport(&lsa->u.sa, htons(port_num));
     return xconnect_stream(lsa);
 }
@@ -279 +315 @@
 int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
 {
-    unsigned opt;
     const char *port = "ftp";
     /* socket to ftp server */
@@ -308 +343 @@
 #endif
     opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
-    opt = getopt32(argv, "cvu:p:P:", &user, &password, &port,
+    getopt32(argv, "cvu:p:P:", &user, &password, &port,
                     &verbose_flag, &do_continue);
     argv += optind;