diff options
| author | ru <ru@FreeBSD.org> | 2002-05-10 13:06:34 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-05-10 13:06:34 +0000 |
| commit | 75c39d9e5c220e37590799f71782e9286492d564 (patch) | |
| tree | a85ef43a924336979b81096bcb8bfbd430a112bc /usr.bin/xargs | |
| parent | 63e16b5a37fe6e85bbaf6e4098088b05ce79a22a (diff) | |
| download | FreeBSD-src-75c39d9e5c220e37590799f71782e9286492d564.zip FreeBSD-src-75c39d9e5c220e37590799f71782e9286492d564.tar.gz | |
xargs.c,v 1.33 broke the upgrade path from old versions of 4.x and 5.0.
Diffstat (limited to 'usr.bin/xargs')
| -rw-r--r-- | usr.bin/xargs/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/xargs/xargs.c | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index 1f33228..1f258ca 100644 --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -5,4 +5,8 @@ PROG= xargs SRCS= xargs.c strnsubst.c WARNS?= 4 +.if defined(BOOTSTRAPPING) +CFLAGS+=-DBOOTSTRAPPING +.endif + .include <bsd.prog.mk> diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index d13b23a..32f8a75 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -56,7 +56,9 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> +#ifndef BOOTSTRAPPING #include <langinfo.h> +#endif #include <locale.h> #include <paths.h> #include <regex.h> @@ -536,7 +538,13 @@ prompt(void) (void)fprintf(stderr, "?..."); (void)fflush(stderr); if ((response = fgetln(ttyfp, &rsize)) == NULL || - regcomp(&cre, nl_langinfo(YESEXPR), REG_BASIC) != 0) { + regcomp(&cre, +#ifdef BOOTSTRAPPING + "^[yY]", +#else + nl_langinfo(YESEXPR), +#endif + REG_BASIC) != 0) { (void)fclose(ttyfp); return (0); } |
