sulogin: use bb_error_msg instead of bb_info_msg; better message

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

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index f63df55f4719456d27a14fb7416b80fd116b384e..b398bc8742f79f534ef219052994571bf5390e30 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -16,39 +16,37 @@
 //usage:#define ftpget_trivial_usage
 //usage:       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
 //usage:#define ftpget_full_usage "\n\n"
-//usage:       "Retrieve a remote file via FTP\n"
-//usage:     "\nOptions:"
+//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   Username"
-//usage:     "\n       -p,--password   Password"
-//usage:     "\n       -P,--port       Port number"
+//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      Username"
-//usage:     "\n       -p      Password"
-//usage:     "\n       -P      Port number"
+//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:       "Store a local file on a remote machine via FTP\n"
-//usage:     "\nOptions:"
+//usage:       "Upload a file to a FTP server\n"
 //usage:       IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
-//usage:     "\n       -v,--verbose    Verbose"
-//usage:     "\n       -u,--username   Username"
-//usage:     "\n       -p,--password   Password"
-//usage:     "\n       -P,--port       Port number"
+//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      Username"
-//usage:     "\n       -p      Password"
-//usage:     "\n       -P      Port number"
+//usage:     "\n       -u USER Username"
+//usage:     "\n       -p PASS Password"
+//usage:     "\n       -P NUM  Port number"
 //usage:       )
 
 #include "libbb.h"
@@ -64,9 +62,6 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
-struct BUG_G_too_big {
-       char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
 #define user           (G.user          )
 #define password       (G.password      )
 #define lsa            (G.lsa           )
@@ -74,7 +69,9 @@ struct BUG_G_too_big {
 #define verbose_flag   (G.verbose_flag  )
 #define do_continue    (G.do_continue   )
 #define buf            (G.buf           )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+       BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
+} while (0)
 
 
 static void ftp_die(const char *msg) NORETURN;