oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(getarg): also set optind when returning error

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7112 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-10-05 22:43:28 +00:00
parent 76ab5ccd3f
commit 8f1b20431e
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/roken/getarg.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -421,9 +421,11 @@ getarg(struct getargs *args, size_t num_args,
} }
ret = arg_match_long (args, num_args, argv[i] + 2, ret = arg_match_long (args, num_args, argv[i] + 2,
argc, argv, &i); argc, argv, &i);
if(ret) if(ret) {
*optind = i;
return ret; return ret;
}else{ }
} else {
for(j = 1; argv[i][j]; j++) { for(j = 1; argv[i][j]; j++) {
for(k = 0; k < num_args; k++) { for(k = 0; k < num_args; k++) {
char *optarg; char *optarg;
@@ -444,12 +446,16 @@ getarg(struct getargs *args, size_t num_args,
i++; i++;
optarg = argv[i]; optarg = argv[i];
} }
if(optarg == NULL) if(optarg == NULL) {
*optind = i;
return ARG_ERR_NO_ARG; return ARG_ERR_NO_ARG;
}
if(args[k].type == arg_integer){ if(args[k].type == arg_integer){
int tmp; int tmp;
if(sscanf(optarg, "%d", &tmp) != 1) if(sscanf(optarg, "%d", &tmp) != 1) {
*optind = i;
return ARG_ERR_BAD_ARG; return ARG_ERR_BAD_ARG;
}
*(int*)args[k].value = tmp; *(int*)args[k].value = tmp;
goto out; goto out;
}else if(args[k].type == arg_string){ }else if(args[k].type == arg_string){
@@ -460,23 +466,30 @@ getarg(struct getargs *args, size_t num_args,
goto out; goto out;
} else if(args[k].type == arg_double){ } else if(args[k].type == arg_double){
double tmp; double tmp;
if(sscanf(optarg, "%lf", &tmp) != 1) if(sscanf(optarg, "%lf", &tmp) != 1) {
*optind = i;
return ARG_ERR_BAD_ARG; return ARG_ERR_BAD_ARG;
}
*(double*)args[k].value = tmp; *(double*)args[k].value = tmp;
goto out; goto out;
} else if(args[k].type == arg_collect){ } else if(args[k].type == arg_collect){
struct getarg_collect_info *c = args[k].value; struct getarg_collect_info *c = args[k].value;
if((*c->func)(optarg, argc, argv, &i, if((*c->func)(optarg, argc, argv, &i,
c->data)) c->data)) {
*optind = i;
return ARG_ERR_BAD_ARG; return ARG_ERR_BAD_ARG;
}
goto out; goto out;
} }
*optind = i;
return ARG_ERR_BAD_ARG; return ARG_ERR_BAD_ARG;
} }
} }
if (k == num_args) if (k == num_args) {
*optind = i;
return ARG_ERR_NO_MATCH; return ARG_ERR_NO_MATCH;
}
} }
out:; out:;
} }