f9beb61a8
Denis Vlasenko
2009-03-25
Subject
tftp: when we infer local name from remote (-r [/]path/path/file), strip path. This mimics wget and is generally more intuitive.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/tftp.c+8 -3
| @@ -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(); | |