diff options
| author | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
| commit | 3a971fe69aad52dfd248901ae796e64a96ae3e37 (patch) | |
| tree | ac7b5c62510ffa9f0316643bcb19a3fed3d5bef7 /crypto/heimdal/lib/roken/getarg.c | |
| parent | 2934fc23653f64b32f4db32233d7eda11ca274f0 (diff) | |
| parent | ebfe6dc471c206300fd82c7c0fd145f683aa52f6 (diff) | |
| download | FreeBSD-src-3a971fe69aad52dfd248901ae796e64a96ae3e37.zip FreeBSD-src-3a971fe69aad52dfd248901ae796e64a96ae3e37.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r72445,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/heimdal/lib/roken/getarg.c')
| -rw-r--r-- | crypto/heimdal/lib/roken/getarg.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crypto/heimdal/lib/roken/getarg.c b/crypto/heimdal/lib/roken/getarg.c index d9a03a5..342388e 100644 --- a/crypto/heimdal/lib/roken/getarg.c +++ b/crypto/heimdal/lib/roken/getarg.c @@ -33,10 +33,12 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: getarg.c,v 1.34 2000/02/13 21:06:43 assar Exp $"); +RCSID("$Id: getarg.c,v 1.37 2000/12/25 17:03:15 assar Exp $"); #endif #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <roken.h> #include "getarg.h" @@ -56,11 +58,12 @@ print_arg (char *string, size_t len, int mdoc, int longp, struct getargs *arg) if(longp) strlcat(string, "= Ns", len); strlcat(string, " Ar ", len); - }else + } else { if (longp) strlcat (string, "=", len); else strlcat (string, " ", len); + } if (arg->arg_help) s = arg->arg_help; @@ -68,6 +71,8 @@ print_arg (char *string, size_t len, int mdoc, int longp, struct getargs *arg) s = "integer"; else if (arg->type == arg_string) s = "string"; + else if (arg->type == arg_strings) + s = "strings"; else if (arg->type == arg_double) s = "float"; else @@ -461,8 +466,10 @@ arg_match_short (struct getargs *args, size_t num_args, ++*optind; optarg = rargv[*optind]; } - if(optarg == NULL) + if(optarg == NULL) { + --*optind; return ARG_ERR_NO_ARG; + } if(args[k].type == arg_integer) { int tmp; if(sscanf(optarg, "%d", &tmp) != 1) |
