mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
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>
This commit is contained in:
parent
337a31b074
commit
1dacfbb1f4
@ -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:" \
|
||||
|
@ -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]);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user