diff options
author | Mattias Andrée <maandree@kth.se> | 2016-12-01 13:41:15 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@kth.se> | 2016-12-01 13:41:15 +0100 |
commit | 7489bc210520c027e95f0ee8c8df8d0805f50f67 (patch) | |
tree | 01486d2494e5b91d4dbaa75586b6d6688a6e837a /src/cg-gamma.c | |
parent | Add cg-tools.7 (diff) | |
download | cg-tools-7489bc210520c027e95f0ee8c8df8d0805f50f67.tar.gz cg-tools-7489bc210520c027e95f0ee8c8df8d0805f50f67.tar.bz2 cg-tools-7489bc210520c027e95f0ee8c8df8d0805f50f67.tar.xz |
Fix arg parsing
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r-- | src/cg-gamma.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/cg-gamma.c b/src/cg-gamma.c index 2894f71..b72cd21 100644 --- a/src/cg-gamma.c +++ b/src/cg-gamma.c @@ -372,25 +372,15 @@ static int parse_gamma_file(const char* restrict pathname) * This function is called after the last * call to `handle_opt` * - * @param argc The number of unparsed arguments - * @param argv `NULL` terminated list of unparsed arguments - * @param method The argument associated with the "-M" option - * @param site The argument associated with the "-S" option - * @param crtcs_ The arguments associated with the "-c" options, `NULL`-terminated - * @param prio The argument associated with the "-p" option - * @param rule The argument associated with the "-R" option - * @return Zero on success, -1 on error + * @param argc The number of unparsed arguments + * @param argv `NULL` terminated list of unparsed arguments + * @param prio The argument associated with the "-p" option + * @return Zero on success, -1 on error */ -int handle_args(int argc, char* argv[], char* method, char* site, - char** crtcs_, char* prio, char* rule) +int handle_args(int argc, char* argv[], char* prio) { int free_fflag = 0, saved_errno; int q = xflag + dflag; - q += (method != NULL) && !strcmp(method, "?"); - q += (prio != NULL) && !strcmp(prio, "?"); - q += (rule != NULL) && (!strcmp(rule, "?") || !strcmp(rule, "??")); - for (; *crtcs_; crtcs_++) - q += !strcmp(*crtcs_, "?"); if ((q > 1) || (fflag && argc) || (xflag && ((fflag != NULL) || (argc > 0) || (prio != NULL)))) usage(); if (argc == 1) @@ -429,7 +419,6 @@ int handle_args(int argc, char* argv[], char* method, char* site, free(fflag), fflag = NULL; errno = saved_errno; return cleanup(-1); - (void) site; } |