diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-11-13 13:49:29 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-11-13 13:49:29 +0000 |
| commit | 40c6b893d8592bcb26e09c972be2891c2b79ff1f (patch) | |
| tree | d4d4eae9350b90f65572d961ca980edfb1f019f1 /usr.bin/xargs | |
| parent | b448dd2f9ebb1f5ccf7ab98c6dbbbdc3aa7ceb48 (diff) | |
| download | src-40c6b893d8592bcb26e09c972be2891c2b79ff1f.tar.gz src-40c6b893d8592bcb26e09c972be2891c2b79ff1f.zip | |
Take __FreeBSD_version into account when BOOTSTRAPPING.
Notes
Notes:
svn path=/head/; revision=106852
Diffstat (limited to 'usr.bin/xargs')
| -rw-r--r-- | usr.bin/xargs/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/xargs/xargs.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index 1f258ca68292..1f33228d8035 100644 --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -5,8 +5,4 @@ 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 96ad3b44d482..5414e65f99dd 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -51,12 +51,13 @@ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <sys/param.h> #include <sys/wait.h> #include <err.h> #include <errno.h> -#ifndef BOOTSTRAPPING +#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500017 #include <langinfo.h> #endif #include <locale.h> @@ -542,10 +543,11 @@ prompt(void) (void)fflush(stderr); if ((response = fgetln(ttyfp, &rsize)) == NULL || regcomp(&cre, -#ifdef BOOTSTRAPPING - "^[yY]", -#else +#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500017 nl_langinfo(YESEXPR), +#else + "^[yY]", #endif REG_BASIC) != 0) { (void)fclose(ttyfp); |