diff options
| author | nicm <nicm> | 2022-03-03 08:24:12 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2022-04-06 14:19:50 +0100 |
| commit | 355ced93cc219897bf3c660e481808c006ffab6a (patch) | |
| tree | 0f3c0e4a74e29635cb8d7e7f5a34dad5dbf3254e /arguments.c | |
| parent | bc0bd8213d26d7b85cdf2c26fbd68942291b5994 (diff) | |
| download | rtmux-355ced93cc219897bf3c660e481808c006ffab6a.tar.gz rtmux-355ced93cc219897bf3c660e481808c006ffab6a.tar.bz2 rtmux-355ced93cc219897bf3c660e481808c006ffab6a.zip | |
Allow optional arguments.
Diffstat (limited to 'arguments.c')
| -rw-r--r-- | arguments.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/arguments.c b/arguments.c index a27d8e0a..91c470e2 100644 --- a/arguments.c +++ b/arguments.c @@ -131,8 +131,9 @@ args_parse(const struct args_parse *parse, struct args_value *values, u_int i; enum args_parse_type type; struct args_value *value, *new; - u_char flag, argument; + u_char flag; const char *found, *string, *s; + int optional_argument; if (count == 0) return (args_create()); @@ -169,18 +170,27 @@ args_parse(const struct args_parse *parse, struct args_value *values, args_free(args); return (NULL); } - argument = *++found; - if (argument != ':') { + if (*++found != ':') { log_debug("%s: -%c", __func__, flag); args_set(args, flag, NULL); continue; } + if (*found == ':') { + optional_argument = 1; + found++; + } new = xcalloc(1, sizeof *new); if (*string != '\0') { new->type = ARGS_STRING; new->string = xstrdup(string); } else { if (i == count) { + if (optional_argument) { + log_debug("%s: -%c", __func__, + flag); + args_set(args, flag, NULL); + continue; + } xasprintf(cause, "-%c expects an argument", flag); |