From 41cc1b688507dd2571df3e353eea8ec8c2273de6 Mon Sep 17 00:00:00 2001 From: "Joseph C. Lehner" Date: Fri, 12 Feb 2016 13:25:10 +0100 Subject: [PATCH] Some changes related to "-f -" --- nmrp.c | 6 +++++- tftp.c | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nmrp.c b/nmrp.c index 5db2ddd..66c1667 100644 --- a/nmrp.c +++ b/nmrp.c @@ -431,7 +431,11 @@ int nmrp_do(struct nmrpd_args *args) } if (!err && args->filename) { - printf("Uploading %s ... ", args->filename); + if (!strcmp(args->filename, "-")) { + printf("Uploading from stdin ... "); + } else { + printf("Uploading %s ... ", args->filename); + } fflush(stdout); err = tftp_put(args); } diff --git a/tftp.c b/tftp.c index eb1b996..cbc9eba 100644 --- a/tftp.c +++ b/tftp.c @@ -87,8 +87,10 @@ static void pkt_mkwrq(char *pkt, const char *filename) filename = leafname(filename); if (!is_netascii(filename) || strlen(filename) > 500) { - fprintf(stderr, "Overlong/illegal filename; using 'firmware.bin'.\n"); - filename = "firmware.bin"; + fprintf(stderr, "Overlong/illegal filename; using 'firmware'.\n"); + filename = "firmware"; + } else if (!strcmp(filename, "-")) { + filename = "firmware"; } pkt_mknum(pkt, WRQ); -- 2.25.1