Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

ftpget/put: make 3rd parameter optional

Browse Source 
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:
Vladimir Dronnikov 2009-10-23 23:34:43 +02:00 committed by Denys Vlasenko
parent 337a31b074
commit 1dacfbb1f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/usage.h
View File

@ -1362,7 +1362,7 @@
"\n DIR Change root to this directory" \ "\n DIR Change root to this directory" \
#define ftpget_trivial_usage \ #define ftpget_trivial_usage \
"[OPTIONS] HOST LOCAL_FILE REMOTE_FILE" "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
#define ftpget_full_usage "\n\n" \ #define ftpget_full_usage "\n\n" \
"Retrieve a remote file via FTP\n" \ "Retrieve a remote file via FTP\n" \
"\nOptions:" \ "\nOptions:" \
@ -1382,7 +1382,7 @@
) )
#define ftpput_trivial_usage \ #define ftpput_trivial_usage \
"[OPTIONS] HOST REMOTE_FILE LOCAL_FILE" "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
#define ftpput_full_usage "\n\n" \ #define ftpput_full_usage "\n\n" \
"Store a local file on a remote machine via FTP\n" \ "Store a local file on a remote machine via FTP\n" \
"\nOptions:" \ "\nOptions:" \

4
networking/ftpgetput.c
View File

@ -306,7 +306,7 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
applet_long_options = ftpgetput_longopts; applet_long_options = ftpgetput_longopts;
#endif #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, opt = getopt32(argv, "cvu:p:P:", &user, &password, &port,
&verbose_flag, &do_continue); &verbose_flag, &do_continue);
argv += optind; argv += optind;
@ -321,5 +321,5 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
} }
ftp_login(); ftp_login();
return ftp_action(argv[1], argv[2]); return ftp_action(argv[1], argv[2] ? argv[2] : argv[1]);
} }