From f9beb61a81a861d31161d086fb6dc59e01c00944 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 25 Mar 2009 03:55:53 +0000 Subject: tftp: when we infer local name from remote (-r [/]path/path/file), strip path. This mimics wget and is generally more intuitive. --- networking/tftp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'networking/tftp.c') diff --git a/networking/tftp.c b/networking/tftp.c index fa0851615..9c78b6e14 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -589,10 +589,15 @@ int tftp_main(int argc UNUSED_PARAM, char **argv) } #endif - if (!local_file) - local_file = remote_file; - if (!remote_file) + if (remote_file) { + if (!local_file) { + const char *slash = strrchr(remote_file, '/'); + local_file = slash ? slash + 1 : remote_file; + } + } else { remote_file = local_file; + } + /* Error if filename or host is not known */ if (!remote_file || !argv[0]) bb_show_usage(); -- cgit v1.2.3