diff options
Diffstat (limited to 'bin/csh/exp.c')
| -rw-r--r-- | bin/csh/exp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/csh/exp.c b/bin/csh/exp.c index 9ed891047c6..a62753d68e4 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exp.c,v 1.17 2018/09/17 16:00:19 martijn Exp $ */ +/* $OpenBSD: exp.c,v 1.18 2018/09/18 06:56:09 deraadt Exp $ */ /* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */ /*- @@ -36,7 +36,6 @@ #include <stdlib.h> #include <unistd.h> #include <stdarg.h> -#include <string.h> #include "csh.h" #include "extern.h" @@ -239,7 +238,7 @@ exp3a(Char ***vp, bool ignore) p1 = exp4(vp, ignore); op = **vp; - if (op && strchr("<>", op[0]) && op[0] == op[1]) { + if (op && any("<>", op[0]) && op[0] == op[1]) { (*vp)++; p2 = exp3a(vp, ignore); if (op[0] == '<') @@ -393,7 +392,7 @@ exp6(Char ***vp, bool ignore) if (isa(**vp, ANYOP)) return (Strsave(STRNULL)); cp = *(*vp)++; - if (*cp == '-' && strchr("erwxfdzopls", cp[1])) { + if (*cp == '-' && any("erwxfdzopls", cp[1])) { struct stat stb; if (cp[2] != '\0') |