pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some changes related to "-f -"

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-12 13:25:10 +01:00
parent 78ae82e5a3
commit 41cc1b6885
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nmrp.c
View file

@ -431,7 +431,11 @@ int nmrp_do(struct nmrpd_args *args)
} }
if (!err && args->filename) { 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); fflush(stdout);
err = tftp_put(args); err = tftp_put(args);
} }

6
tftp.c
View file

@ -87,8 +87,10 @@ static void pkt_mkwrq(char *pkt, const char *filename)
filename = leafname(filename); filename = leafname(filename);
if (!is_netascii(filename) || strlen(filename) > 500) { if (!is_netascii(filename) || strlen(filename) > 500) {
fprintf(stderr, "Overlong/illegal filename; using 'firmware.bin'.\n"); fprintf(stderr, "Overlong/illegal filename; using 'firmware'.\n");
filename = "firmware.bin"; filename = "firmware";
} else if (!strcmp(filename, "-")) {
filename = "firmware";
} }
pkt_mknum(pkt, WRQ); pkt_mknum(pkt, WRQ);