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

Fix long form of negative flags.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4342 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-01-22 20:23:16 +00:00
parent 4ef3b94737
commit 9d2c40aa7a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/roken/getarg.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -45,12 +45,14 @@ RCSID("$Id$");
#include <roken.h> #include <roken.h>
#include "getarg.h" #include "getarg.h"
#define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
static size_t static size_t
print_arg (FILE *stream, int mdoc, int longp, struct getargs *arg) print_arg (FILE *stream, int mdoc, int longp, struct getargs *arg)
{ {
const char *s; const char *s;
if (arg->type == arg_flag || arg->type == arg_negative_flag) if (ISFLAG(*arg))
return 0; return 0;
if(mdoc){ if(mdoc){
@@ -277,8 +279,7 @@ arg_match_long(struct getargs *args, size_t num_args,
++partial_match; ++partial_match;
partial = &args[i]; partial = &args[i];
optarg = p + p_len; optarg = p + p_len;
} else if (args[i].type == arg_flag } else if (ISFLAG(args[i]) && strncmp (p, "no-", 3) == 0) {
&& strncmp (p, "no-", 3) == 0) {
negate = !negate; negate = !negate;
p += 3; p += 3;
p_len -= 3; p_len -= 3;
@@ -296,7 +297,7 @@ arg_match_long(struct getargs *args, size_t num_args,
else else
return ARG_ERR_NO_MATCH; return ARG_ERR_NO_MATCH;
if(*optarg != '=' && (current->type != arg_flag && *optarg == 0)) if(*optarg == '\0' && !ISFLAG(*current))
return ARG_ERR_NO_MATCH; return ARG_ERR_NO_MATCH;
switch(current->type){ switch(current->type){
case arg_integer: case arg_integer:
@@ -318,9 +319,10 @@ arg_match_long(struct getargs *args, size_t num_args,
return 0; return 0;
} }
case arg_flag: case arg_flag:
case arg_negative_flag:
{ {
int *flag = current->value; int *flag = current->value;
if(*optarg == 0 || if(*optarg == '\0' ||
strcmp(optarg + 1, "yes") == 0 || strcmp(optarg + 1, "yes") == 0 ||
strcmp(optarg + 1, "true") == 0){ strcmp(optarg + 1, "true") == 0){
*flag = !negate; *flag = !negate;