diff options
| author | Vladimir Dronnikov | 2009-10-23 23:34:43 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2009-10-23 23:34:43 +0200 |
| commit | 1dacfbb1f466a2964cbf49855f336bcc1d25ebc0 (patch) | |
| tree | c0fd2cd5645e19cef4e1d9945a4fe70189ade51a | |
| parent | 337a31b0741f5e9ba32bedd750ab99bb253085dc (diff) | |
| download | busybox-1dacfbb1f466a2964cbf49855f336bcc1d25ebc0.zip busybox-1dacfbb1f466a2964cbf49855f336bcc1d25ebc0.tar.gz | |
ftpget/put: make 3rd parameter optional
function old new delta
packed_usage 26728 26738 +10
ftpgetput_main 343 351 +8
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/usage.h | 4 | ||||
| -rw-r--r-- | networking/ftpgetput.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/usage.h b/include/usage.h index 8db1946..d03ec22 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1362,7 +1362,7 @@ "\n DIR Change root to this directory" \ #define ftpget_trivial_usage \ - "[OPTIONS] HOST LOCAL_FILE REMOTE_FILE" + "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE" #define ftpget_full_usage "\n\n" \ "Retrieve a remote file via FTP\n" \ "\nOptions:" \ @@ -1382,7 +1382,7 @@ ) #define ftpput_trivial_usage \ - "[OPTIONS] HOST REMOTE_FILE LOCAL_FILE" + "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE" #define ftpput_full_usage "\n\n" \ "Store a local file on a remote machine via FTP\n" \ "\nOptions:" \ diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index d39b73e..c0ecdda 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -306,7 +306,7 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS applet_long_options = ftpgetput_longopts; #endif - opt_complementary = "=3:vv:cc"; /* must have 3 params; -v and -c count */ + opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */ opt = getopt32(argv, "cvu:p:P:", &user, &password, &port, &verbose_flag, &do_continue); argv += optind; @@ -321,5 +321,5 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv) } ftp_login(); - return ftp_action(argv[1], argv[2]); + return ftp_action(argv[1], argv[2] ? argv[2] : argv[1]); } |