Some changes related to "-f -"

diff --git a/nmrp.c b/nmrp.c
index 5db2ddd4113d24914d898356f3fe3b6847b498fc..66c166713a988646f0cc3d44dee56fb16ab26903 100644 (file)
--- 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 eb1b996ee30fcef623a04536d1f353f99f46607d..cbc9eba79635b842ea341d7869bcf4b5fda0aac7 100644 (file)
--- 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);