diff options
| author | Pete Batard <pete@akeo.ie> | 2012-08-12 22:57:10 +0100 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2012-08-12 22:57:10 +0100 |
| commit | d53c599d0b1f9cd04af4ce788de3e3e41a7591a0 (patch) | |
| tree | e170e6b665539c90b923aee86762570e7372c6fd | |
| parent | de56675c99f8f7b0b13a08dfe6a076bfdff928d0 (diff) | |
Samples: Make target mandatory with -b option in xusb
| -rw-r--r-- | examples/xusb.c | 14 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/examples/xusb.c b/examples/xusb.c index 3e8d262..c0c08bf 100644 --- a/examples/xusb.c +++ b/examples/xusb.c @@ -54,7 +54,7 @@ // Global variables bool binary_dump = false; -char binary_name[64] = "raw.bin"; +const char* binary_name = NULL; static int perr(char const *format, ...) { @@ -934,13 +934,11 @@ int main(int argc, char** argv) debug_mode = true; break; case 'b': - if (j+1 < argc) { - // WDK's OACR doesn't like strncpy... - for (i=0; (i<(sizeof(binary_name)-1)) && (argv[j+1][i] != 0); i++) - binary_name[i] = argv[j+1][i]; - binary_name[i] = 0; - j++; + if ((j+1 >= argc) || (argv[j+1][0] == '-') || (argv[j+1][0] == '/')) { + printf(" Option -b requires a file name"); + return 1; } + binary_name = argv[++j]; binary_dump = true; break; case 'g': @@ -1002,7 +1000,7 @@ int main(int argc, char** argv) } if ((show_help) || (argc == 1) || (argc > 7)) { - printf("usage: %s [-d] [-b [file]] [-h] [-i] [-j] [-k] [-x] [vid:pid]\n", argv[0]); + printf("usage: %s [-d] [-b file] [-h] [-i] [-j] [-k] [-x] [vid:pid]\n", argv[0]); printf(" -h: display usage\n"); printf(" -d: enable debug output (if library was compiled with debug enabled)\n"); printf(" -b: dump Mass Storage first block to binary file\n"); diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 5362c25..1582ec7 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10547 +#define LIBUSB_NANO 10548 |