diff options
| author | Mattias Andrée <m@maandree.se> | 2025-03-23 19:48:58 +0100 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2025-03-23 19:48:58 +0100 |
| commit | f5073ed39f8a244fe70ba2294aa8dec18bac39d0 (patch) | |
| tree | e86f82721c0cbab173c0a9aa65e61324969e018e /src | |
| parent | Clean up (diff) | |
| download | redshift-ng-f5073ed39f8a244fe70ba2294aa8dec18bac39d0.tar.gz redshift-ng-f5073ed39f8a244fe70ba2294aa8dec18bac39d0.tar.bz2 redshift-ng-f5073ed39f8a244fe70ba2294aa8dec18bac39d0.tar.xz | |
Add ; as option delimiter
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rw-r--r-- | src/common.h | 1 | ||||
| -rw-r--r-- | src/gamma.c | 11 | ||||
| -rw-r--r-- | src/location.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/common.h b/src/common.h index fa1a0f2..5d3e7a4 100644 --- a/src/common.h +++ b/src/common.h @@ -46,6 +46,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <strings.h> #include <time.h> #include <unistd.h> #ifdef _POSIX_TIMERS diff --git a/src/gamma.c b/src/gamma.c index a66f2b2..44042d0 100644 --- a/src/gamma.c +++ b/src/gamma.c @@ -63,9 +63,12 @@ try_start(const struct gamma_method *method, GAMMA_STATE **state_out, struct con goto set_option_fail; /* Set method options from command line */ - while (args) { - next_arg = strchr(args, ':'); - if (next_arg) + for (; args && *args; args = next_arg) { + if (!strncasecmp(args, "display=", sizeof("display=") - 1U)) + next_arg = &args[strcspn(args, ";")]; + else + next_arg = &args[strcspn(args, ";:")]; + if (*next_arg) *next_arg++ = '\0'; key = args; @@ -78,8 +81,6 @@ try_start(const struct gamma_method *method, GAMMA_STATE **state_out, struct con if (method->set_option(*state_out, key, value) < 0) goto set_option_fail; - - args = next_arg; } /* Start method */ diff --git a/src/location.c b/src/location.c index bd852a1..8ca4374 100644 --- a/src/location.c +++ b/src/location.c @@ -82,9 +82,9 @@ try_start(const struct location_provider *provider, LOCATION_STATE **state_out, goto set_option_fail; /* Set provider options from command line */ - for (i = 0; args; i++) { - next_arg = strchr(args, ':'); - if (next_arg) + for (i = 0; args && *args; i++, args = next_arg) { + next_arg = &args[strcspn(args, ";:")]; + if (*next_arg) *next_arg++ = '\0'; key = args; @@ -107,8 +107,6 @@ try_start(const struct location_provider *provider, LOCATION_STATE **state_out, if (provider->set_option(*state_out, key, value) < 0) goto set_option_fail; - - args = next_arg; } /* Start provider */ |