Use stdbool.h instead of rolling our own bools.
From: Todd C. Miller <millert@cvs.openbsd.org> XXX #ifndef HAVE_STDBOOL_H ?
This commit is contained in:
16
eval.c
16
eval.c
@ -1,4 +1,4 @@
|
||||
/** $MirBSD: src/bin/ksh/eval.c,v 2.6 2004/12/18 19:27:21 tg Exp $ */
|
||||
/** $MirBSD: src/bin/ksh/eval.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */
|
||||
/* $OpenBSD: eval.c,v 1.18 2004/12/13 16:37:06 millert Exp $ */
|
||||
|
||||
/*
|
||||
@ -10,7 +10,7 @@
|
||||
#include "ksh_dir.h"
|
||||
#include "ksh_stat.h"
|
||||
|
||||
__RCSID("$MirBSD: src/bin/ksh/eval.c,v 2.6 2004/12/18 19:27:21 tg Exp $");
|
||||
__RCSID("$MirBSD: src/bin/ksh/eval.c,v 2.7 2004/12/28 22:32:08 tg Exp $");
|
||||
|
||||
/*
|
||||
* string expansion
|
||||
@ -874,7 +874,7 @@ comsub(Expand *xp, char *cp)
|
||||
shf = shf_fdopen(pv[0], SHF_RD, NULL);
|
||||
ofd1 = savefd(1, 0); /* fd 1 may be closed... */
|
||||
if (pv[1] != 1) {
|
||||
ksh_dup2(pv[1], 1, FALSE);
|
||||
ksh_dup2(pv[1], 1, false);
|
||||
close(pv[1]);
|
||||
}
|
||||
execute(t, XFORK|XXCOM|XPIPEO);
|
||||
@ -901,7 +901,7 @@ trimsub(char *str, char *pat, int how)
|
||||
case '#': /* shortest at beginning */
|
||||
for (p = str; p <= end; p++) {
|
||||
c = *p; *p = '\0';
|
||||
if (gmatch(str, pat, FALSE)) {
|
||||
if (gmatch(str, pat, false)) {
|
||||
*p = c;
|
||||
return p;
|
||||
}
|
||||
@ -911,7 +911,7 @@ trimsub(char *str, char *pat, int how)
|
||||
case '#'|0x80: /* longest match at beginning */
|
||||
for (p = end; p >= str; p--) {
|
||||
c = *p; *p = '\0';
|
||||
if (gmatch(str, pat, FALSE)) {
|
||||
if (gmatch(str, pat, false)) {
|
||||
*p = c;
|
||||
return p;
|
||||
}
|
||||
@ -920,13 +920,13 @@ trimsub(char *str, char *pat, int how)
|
||||
break;
|
||||
case '%': /* shortest match at end */
|
||||
for (p = end; p >= str; p--) {
|
||||
if (gmatch(p, pat, FALSE))
|
||||
if (gmatch(p, pat, false))
|
||||
return str_nsave(str, p - str, ATEMP);
|
||||
}
|
||||
break;
|
||||
case '%'|0x80: /* longest match at end */
|
||||
for (p = str; p <= end; p++) {
|
||||
if (gmatch(p, pat, FALSE))
|
||||
if (gmatch(p, pat, false))
|
||||
return str_nsave(str, p - str, ATEMP);
|
||||
}
|
||||
break;
|
||||
@ -1094,7 +1094,7 @@ globit(XString *xs, char **xpp, char *sp, XPtrV *wp, int check)
|
||||
(name[1] == 0 || (name[1] == '.' && name[2] == 0)))
|
||||
continue; /* always ignore . and .. */
|
||||
if ((*name == '.' && *sp != '.')
|
||||
|| !gmatch(name, sp, TRUE))
|
||||
|| !gmatch(name, sp, true))
|
||||
continue;
|
||||
|
||||
len = NLENGTH(d) + 1;
|
||||
|
Reference in New Issue
Block a user