philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from develop

Browse Source
This commit is contained in:
Allen Byrne
2017-10-19 12:50:28 -05:00
parent a1a1840d6e
commit f183ecd3f9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/lib/h5tools_utils.c
View File

@@ -205,8 +205,9 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
opt_opt = l_opts[i].shortval;
if (l_opts[i].has_arg != no_arg) {
if (arg[len] == '=')
if (arg[len] == '=') {
opt_arg = &arg[len + 1];
}
else if (l_opts[i].has_arg != optional_arg) {
if (opt_ind < (argc - 1))
if (argv[opt_ind + 1][0] != '-')
@@ -295,13 +296,16 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
opt_ind++;
/* we do have an extra argument, check if not last */
if ( (opt_ind+1) < argc ) {
if ( argv[opt_ind][0] != '-' )
if ( argv[opt_ind][0] != '-' ) {
opt_arg = argv[opt_ind++];
else
}
else {
opt_arg = NULL;
}
}
else
else {
opt_arg = NULL;
}
}
else {
/* set up to look at next char in token, next time */