diff options
| author |   krw <krw@openbsd.org> | 2018-03-17 14:03:36 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2018-03-17 14:03:36 +0000 |
| commit | 745ece38b867f16ee9cc677db6647746fbe499de (patch) | |
| tree | 4df8e31ad30ff9153aedef695dc896d96b55d56c /usr.bin/less/option.c | |
| parent | Add proper suspend/resume support. (diff) | |
| download | wireguard-openbsd-745ece38b867f16ee9cc677db6647746fbe499de.tar.xz wireguard-openbsd-745ece38b867f16ee9cc677db6647746fbe499de.zip | |
Split only LESS on $.
As guenther@ said "STOP SPLITTING ANYTHING BUT $LESS ON '$' !".
anton@ came up with the same diff. ok nicm@
Diffstat (limited to 'usr.bin/less/option.c')
| -rw-r--r-- | usr.bin/less/option.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/less/option.c b/usr.bin/less/option.c index 83615f377d6..7bdda88ad75 100644 --- a/usr.bin/less/option.c +++ b/usr.bin/less/option.c @@ -24,7 +24,7 @@ static struct loption *pendopt; int plusoption = FALSE; -static char *optstring(char *, char **, char *, char *); +static char *optstring(char *, char **, char *, char *, int); static int flip_triple(int, int); extern int screen_trashed; @@ -66,7 +66,7 @@ propt(int c) * LESS environment variable) and process it. */ void -scan_option(char *s) +scan_option(char *s, int env) { struct loption *o; int optc; @@ -147,7 +147,7 @@ scan_option(char *s) * EVERY input file. */ plusoption = TRUE; - s = optstring(s, &str, propt('+'), NULL); + s = optstring(s, &str, propt('+'), NULL, 0); if (s == NULL) return; if (*str == '+') @@ -290,7 +290,7 @@ scan_option(char *s) */ while (*s == ' ') s++; - s = optstring(s, &str, printopt, o->odesc[1]); + s = optstring(s, &str, printopt, o->odesc[1], env); if (s == NULL) return; break; @@ -559,7 +559,7 @@ nopendopt(void) * Return a pointer to the remainder of the string, if any. */ static char * -optstring(char *s, char **p_str, char *printopt, char *validchars) +optstring(char *s, char **p_str, char *printopt, char *validchars, int env) { char *p; char *out; @@ -577,7 +577,7 @@ optstring(char *s, char **p_str, char *printopt, char *validchars) /* Take next char literally. */ ++p; } else { - if (*p == END_OPTION_STRING || + if ((*p == END_OPTION_STRING && env == 1) || (validchars != NULL && strchr(validchars, *p) == NULL)) /* End of option string. */ |