mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-04 12:52:15 +00:00
Code Issues Releases Activity

xargs.c,v 1.33 broke the upgrade path from old versions of 4.x and 5.0.

Browse Source
This commit is contained in:
Ruslan Ermilov 2002-05-10 13:06:34 +00:00
parent 9269daa2fb
commit 8e0a87c1b3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=96351
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/xargs/Makefile
View File

@ -5,4 +5,8 @@ PROG= xargs
SRCS= xargs.c strnsubst.c
WARNS?= 4
.if defined(BOOTSTRAPPING)
CFLAGS+=-DBOOTSTRAPPING
.endif
.include <bsd.prog.mk>

10
usr.bin/xargs/xargs.c
View File

@ -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);
}