diff options
| author | dogcow <dogcow@NetBSD.org> | 2007-07-16 02:26:50 +0000 |
|---|---|---|
| committer | dogcow <dogcow@NetBSD.org> | 2007-07-16 02:26:50 +0000 |
| commit | 593a9183f019bfdecd1d7225b96867f5d563408d (patch) | |
| tree | dfa457fd2a7f272defdb68c14fecd0405f09da2c /bin/csh/exec.c | |
| parent | bd5e7f39e55c03a7ec33433fc0c3ba6f3cbb20d9 (diff) | |
Rename bool -> cshbool; despite the name, bool actually holds values other
than 0 or 1. Fixes PR/36650.
Diffstat (limited to 'bin/csh/exec.c')
| -rw-r--r-- | bin/csh/exec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 09c1e47fd22..469bfd40be2 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: exec.c,v 1.23 2006/05/13 21:22:32 christos Exp $ */ +/* $NetBSD: exec.c,v 1.24 2007/07/16 02:26:51 dogcow Exp $ */ /*- * Copyright (c) 1980, 1991, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -__RCSID("$NetBSD: exec.c,v 1.23 2006/05/13 21:22:32 christos Exp $"); +__RCSID("$NetBSD: exec.c,v 1.24 2007/07/16 02:26:51 dogcow Exp $"); #endif #endif /* not lint */ @@ -101,7 +101,7 @@ static void pexerr(void) __attribute__((noreturn)); static void texec(Char *, Char **); static int hashname(Char *); static int tellmewhat(struct wordent *, Char *); -static int executable(Char *, Char *, bool); +static int executable(Char *, Char *, cshbool); static int iscommand(Char *); void @@ -112,7 +112,7 @@ doexec(Char **v, struct command *t) Char *blk[2], **av, *dp, **pv, *sav; int i, hashval, hashval1; sigset_t nsigset; - bool slash; + cshbool slash; hashval = 0; /* @@ -506,7 +506,7 @@ iscommand(Char *name) struct varent *v; Char **pv, *sav; int hashval, hashval1, i; - bool slash; + cshbool slash; hashval = 0; slash = any(short2str(name), '/'); @@ -563,7 +563,7 @@ cont: * This is a bit kludgy, but in the name of optimization... */ static int -executable(Char *dir, Char *name, bool dir_ok) +executable(Char *dir, Char *name, cshbool dir_ok) { struct stat stbuf; Char path[MAXPATHLEN + 1], *dp, *sp; @@ -638,7 +638,7 @@ tellmewhat(struct wordent *lexp, Char *str) struct wordent *sp; Char *cmd, *s0, *s1, *s2; int i; - bool aliased, found; + cshbool aliased, found; Char qc; aliased = 0; @@ -697,7 +697,7 @@ tellmewhat(struct wordent *lexp, Char *str) if ((i = iscommand(sp->word)) != 0) { Char **pv; struct varent *v; - bool slash = any(short2str(sp->word), '/'); + cshbool slash = any(short2str(sp->word), '/'); v = adrof(STRpath); if (v == 0 || v->vec[0] == 0 || slash) |
