diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-01-19 22:39:23 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-19 22:39:23 (GMT) |
commit | a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf (patch) | |
tree | 1a88b6615ef1e6f281ce4e34c66c393a3193f5e2 /tools/src/h5diff | |
parent | a63a1c8a57bd313a0f63c3f39fc18965500c304f (diff) | |
download | hdf5-a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf.zip hdf5-a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf.tar.gz hdf5-a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf.tar.bz2 |
1 12 merge of changes from dev (#271)
* OESS-98 fix tools test for plugins
* sync fork
* Merge of changes from dev
* Move problem option to bottom of the list until fixed
* HDFFV-11106 - fix parsing optional args
* HDFFV-11106 add note
* grammer fix
Diffstat (limited to 'tools/src/h5diff')
-rw-r--r-- | tools/src/h5diff/h5diff_common.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index 95245bd..5646e2a 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -25,7 +25,7 @@ static int check_d_input(const char *); * Command-line options: The user can specify short or long-named * parameters. */ -static const char * s_opts = "hVrv:qn:d:p:NcelxE:A:S"; +static const char * s_opts = "hVrv*qn:d:p:NcelxE:A:S"; static struct long_options l_opts[] = {{"help", no_arg, 'h'}, {"version", no_arg, 'V'}, {"report", no_arg, 'r'}, @@ -253,33 +253,27 @@ parse_command_line(int argc, const char *argv[], const char **fname1, const char case 'v': opts->mode_verbose = 1; - /* This for loop is for handling style like - * -v, -v1, --verbose, --verbose=1. - */ for (i = 1; i < argc; i++) { /* - * short opt + * special check for short opt */ - if (!strcmp(argv[i], "-v")) { /* no arg */ - opt_ind--; + if (!strcmp(argv[i], "-v")) { + if (opt_arg != NULL) + opt_ind--; opts->mode_verbose_level = 0; break; } else if (!strncmp(argv[i], "-v", (size_t)2)) { + if (opt_arg != NULL) + opt_ind--; opts->mode_verbose_level = atoi(&argv[i][2]); break; } - - /* - * long opt - */ - if (!strcmp(argv[i], "--verbose")) { /* no arg */ - opts->mode_verbose_level = 0; - break; - } - else if (!strncmp(argv[i], "--verbose", (size_t)9) && argv[i][9] == '=') { - opts->mode_verbose_level = atoi(&argv[i][10]); - break; + else { + if (opt_arg != NULL) + opts->mode_verbose_level = HDatoi(opt_arg); + else + opts->mode_verbose_level = 0; } } break; |