[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Don't assume that "echo" lives in /bin.
|
From: |
James Youngman |
|
Subject: |
[PATCH] Don't assume that "echo" lives in /bin. |
|
Date: |
Sun, 22 May 2011 14:47:42 +0100 |
* xargs/xargs.c (main): Change default_cmd from "/bin/echo" (which
may not be present on some POSIX systems) to "echo" (which must
exist somewhere on $PATH on any POSIX system).
* doc/find.texi (Multiple Files): document this.
* NEWS: Describe this change.
* xargs/testsuite/xargs.sysv/empty_def-t.xe: Change /bin/echo to
echo.
* xargs/testsuite/xargs.gnu/n2-s26-x-0.exp: Change -s26 to -s21 to
keep the expected test result the same. Rename the test to
reflect the updated arguments.
* xargs/testsuite/xargs.gnu/n2-s26-x-0.xo: Rename to
n2-s21-x-0.xo.
* xargs/testsuite/xargs.gnu/n2-s26-0.exp: Rename to n2-s21-0.exp,
update -s argument.
* xargs/testsuite/xargs.posix/s30.exp: Rename to s25.exp, update -s.
* xargs/testsuite/xargs.posix/s30.xo: Rename to s25.xo.
* xargs/testsuite/xargs.gnu/s30-0.exp: Rename to s25-0.exp, update
-s argument.
* xargs/testsuite/xargs.gnu/s30-0.xo: Rename to s25-0.xo.
* xargs/testsuite/xargs.sysv/s30-t.exp: Rename to s25-t.exp,
update -s.
* xargs/testsuite/xargs.sysv/s30-t.xo: Rename to s25-t.xo.
* xargs/testsuite/xargs.sysv/s30-t.xe: Rename to s25-t.xe, change
/bin/echo to just echo.
* xargs/testsuite/xargs.posix/s47.exp: Rename to s42.exp, update -s.
* xargs/testsuite/xargs.posix/s47.xo: Rename to s42.xo.
* xargs/testsuite/xargs.gnu/n3-s36-0.exp: Rename to n3-s31-0.exp,
update -s.
* xargs/testsuite/xargs.gnu/n3-s36-0.xo: Rename to n3-s31-0.xo.
* xargs/testsuite/xargs.gnu/s20-0.exp: Rename to s15-0.exp, update
-s.
* xargs/testsuite/xargs.gnu/s20-0.xo: Rename to s15-0.xo.
* xargs/testsuite/xargs.posix/n2-s26.exp: Rename to n2-s21.exp,
update -s.
* xargs/testsuite/xargs.posix/n2-s26.xo: Rename to n2-s21.xo.
* xargs/testsuite/xargs.gnu/s19-0.exp: Rename to s14-0.exp, update
-s.
* xargs/testsuite/xargs.gnu/s19-0.xo: Rename to s14-0.xo.
* xargs/testsuite/xargs.gnu/s19_2-0.exp: Rename to s14_2-0.exp,
update -s.
* xargs/testsuite/xargs.gnu/s19_2-0.xo: Rename to s14_2-0.xo.
* xargs/testsuite/xargs.posix/n3-s36.exp: Rename to n3-s31.exp,
update -s.
* xargs/testsuite/xargs.posix/n3-s36.xo: Rename to n3-s31.xo.
* xargs/testsuite/xargs.posix/s19.exp: Rename to s14.exp, update
-s.
* xargs/testsuite/xargs.posix/s19.xo: Rename to s14.xo.
* xargs/testsuite/xargs.posix/s19_2.exp: Rename to s14_2.exp,
update -s.
* xargs/testsuite/xargs.posix/s19_2.xo: Rename to s14_2.xo.
* xargs/testsuite/xargs.posix/s20.exp: Rename to s15.exp,
update -s.
* xargs/testsuite/xargs.posix/s20.xo: Rename to s15.xo.
* xargs/testsuite/Makefile.am (EXTRA_DIST_XO): Update names.
(EXTRA_DIST_EXP): Likewise.
---
ChangeLog | 60 ++++++++++++++++++++++++++++
NEWS | 8 +++-
doc/find.texi | 2 +-
xargs/testsuite/Makefile.am | 62 ++++++++++++++--------------
xargs/testsuite/xargs.gnu/n2-s21-0.exp | 1 +
xargs/testsuite/xargs.gnu/n2-s21-0.xo | 11 +++++
xargs/testsuite/xargs.gnu/n2-s21-x-0.exp | 1 +
xargs/testsuite/xargs.gnu/n2-s21-x-0.xo | 3 +
xargs/testsuite/xargs.gnu/n2-s26-0.exp | 1 -
xargs/testsuite/xargs.gnu/n2-s26-0.xo | 11 -----
xargs/testsuite/xargs.gnu/n2-s26-x-0.exp | 1 -
xargs/testsuite/xargs.gnu/n2-s26-x-0.xo | 3 -
xargs/testsuite/xargs.gnu/n3-s31-0.exp | 1 +
xargs/testsuite/xargs.gnu/n3-s31-0.xo | 7 +++
xargs/testsuite/xargs.gnu/n3-s36-0.exp | 1 -
xargs/testsuite/xargs.gnu/n3-s36-0.xo | 7 ---
xargs/testsuite/xargs.gnu/s14-0.exp | 1 +
xargs/testsuite/xargs.gnu/s14-0.xo | 6 +++
xargs/testsuite/xargs.gnu/s14_2-0.exp | 1 +
xargs/testsuite/xargs.gnu/s15-0.exp | 1 +
xargs/testsuite/xargs.gnu/s15-0.xo | 14 ++++++
xargs/testsuite/xargs.gnu/s19-0.exp | 1 -
xargs/testsuite/xargs.gnu/s19-0.xo | 6 ---
xargs/testsuite/xargs.gnu/s19_2-0.exp | 1 -
xargs/testsuite/xargs.gnu/s20-0.exp | 1 -
xargs/testsuite/xargs.gnu/s20-0.xo | 14 ------
xargs/testsuite/xargs.gnu/s25-0.exp | 1 +
xargs/testsuite/xargs.gnu/s25-0.xo | 6 +++
xargs/testsuite/xargs.gnu/s30-0.exp | 1 -
xargs/testsuite/xargs.gnu/s30-0.xo | 6 ---
xargs/testsuite/xargs.posix/n2-s21-x.exp | 1 +
xargs/testsuite/xargs.posix/n2-s21-x.xo | 3 +
xargs/testsuite/xargs.posix/n2-s21.exp | 1 +
xargs/testsuite/xargs.posix/n2-s21.xo | 11 +++++
xargs/testsuite/xargs.posix/n2-s26-x.exp | 1 -
xargs/testsuite/xargs.posix/n2-s26-x.xo | 3 -
xargs/testsuite/xargs.posix/n2-s26.exp | 1 -
xargs/testsuite/xargs.posix/n2-s26.xo | 11 -----
xargs/testsuite/xargs.posix/n3-s31.exp | 1 +
xargs/testsuite/xargs.posix/n3-s31.xo | 7 +++
xargs/testsuite/xargs.posix/n3-s36.exp | 1 -
xargs/testsuite/xargs.posix/n3-s36.xo | 7 ---
xargs/testsuite/xargs.posix/s14.exp | 1 +
xargs/testsuite/xargs.posix/s14.xo | 6 +++
xargs/testsuite/xargs.posix/s14_2.exp | 1 +
xargs/testsuite/xargs.posix/s15.exp | 1 +
xargs/testsuite/xargs.posix/s15.xo | 14 ++++++
xargs/testsuite/xargs.posix/s19.exp | 1 -
xargs/testsuite/xargs.posix/s19.xo | 6 ---
xargs/testsuite/xargs.posix/s19_2.exp | 1 -
xargs/testsuite/xargs.posix/s20.exp | 1 -
xargs/testsuite/xargs.posix/s20.xo | 14 ------
xargs/testsuite/xargs.posix/s25.exp | 1 +
xargs/testsuite/xargs.posix/s25.xo | 6 +++
xargs/testsuite/xargs.posix/s30.exp | 1 -
xargs/testsuite/xargs.posix/s30.xo | 6 ---
xargs/testsuite/xargs.posix/s42.exp | 1 +
xargs/testsuite/xargs.posix/s42.xo | 18 ++++++++
xargs/testsuite/xargs.posix/s47.exp | 1 -
xargs/testsuite/xargs.posix/s47.xo | 18 --------
xargs/testsuite/xargs.sysv/empty_def-t.xe | 2 +-
xargs/testsuite/xargs.sysv/s25-t.exp | 1 +
xargs/testsuite/xargs.sysv/s25-t.xe | 6 +++
xargs/testsuite/xargs.sysv/s25-t.xo | 6 +++
xargs/testsuite/xargs.sysv/s30-t.exp | 1 -
xargs/testsuite/xargs.sysv/s30-t.xe | 6 ---
xargs/testsuite/xargs.sysv/s30-t.xo | 6 ---
xargs/xargs.c | 2 +-
68 files changed, 241 insertions(+), 175 deletions(-)
create mode 100644 xargs/testsuite/xargs.gnu/n2-s21-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/n2-s21-0.xo
create mode 100644 xargs/testsuite/xargs.gnu/n2-s21-x-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/n2-s21-x-0.xo
delete mode 100644 xargs/testsuite/xargs.gnu/n2-s26-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/n2-s26-0.xo
delete mode 100644 xargs/testsuite/xargs.gnu/n2-s26-x-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/n2-s26-x-0.xo
create mode 100644 xargs/testsuite/xargs.gnu/n3-s31-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/n3-s31-0.xo
delete mode 100644 xargs/testsuite/xargs.gnu/n3-s36-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/n3-s36-0.xo
create mode 100644 xargs/testsuite/xargs.gnu/s14-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/s14-0.xo
create mode 100644 xargs/testsuite/xargs.gnu/s14_2-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/s15-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/s15-0.xo
delete mode 100644 xargs/testsuite/xargs.gnu/s19-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/s19-0.xo
delete mode 100644 xargs/testsuite/xargs.gnu/s19_2-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/s20-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/s20-0.xo
create mode 100644 xargs/testsuite/xargs.gnu/s25-0.exp
create mode 100644 xargs/testsuite/xargs.gnu/s25-0.xo
delete mode 100644 xargs/testsuite/xargs.gnu/s30-0.exp
delete mode 100644 xargs/testsuite/xargs.gnu/s30-0.xo
create mode 100644 xargs/testsuite/xargs.posix/n2-s21-x.exp
create mode 100644 xargs/testsuite/xargs.posix/n2-s21-x.xo
create mode 100644 xargs/testsuite/xargs.posix/n2-s21.exp
create mode 100644 xargs/testsuite/xargs.posix/n2-s21.xo
delete mode 100644 xargs/testsuite/xargs.posix/n2-s26-x.exp
delete mode 100644 xargs/testsuite/xargs.posix/n2-s26-x.xo
delete mode 100644 xargs/testsuite/xargs.posix/n2-s26.exp
delete mode 100644 xargs/testsuite/xargs.posix/n2-s26.xo
create mode 100644 xargs/testsuite/xargs.posix/n3-s31.exp
create mode 100644 xargs/testsuite/xargs.posix/n3-s31.xo
delete mode 100644 xargs/testsuite/xargs.posix/n3-s36.exp
delete mode 100644 xargs/testsuite/xargs.posix/n3-s36.xo
create mode 100644 xargs/testsuite/xargs.posix/s14.exp
create mode 100644 xargs/testsuite/xargs.posix/s14.xo
create mode 100644 xargs/testsuite/xargs.posix/s14_2.exp
create mode 100644 xargs/testsuite/xargs.posix/s15.exp
create mode 100644 xargs/testsuite/xargs.posix/s15.xo
delete mode 100644 xargs/testsuite/xargs.posix/s19.exp
delete mode 100644 xargs/testsuite/xargs.posix/s19.xo
delete mode 100644 xargs/testsuite/xargs.posix/s19_2.exp
delete mode 100644 xargs/testsuite/xargs.posix/s20.exp
delete mode 100644 xargs/testsuite/xargs.posix/s20.xo
create mode 100644 xargs/testsuite/xargs.posix/s25.exp
create mode 100644 xargs/testsuite/xargs.posix/s25.xo
delete mode 100644 xargs/testsuite/xargs.posix/s30.exp
delete mode 100644 xargs/testsuite/xargs.posix/s30.xo
create mode 100644 xargs/testsuite/xargs.posix/s42.exp
create mode 100644 xargs/testsuite/xargs.posix/s42.xo
delete mode 100644 xargs/testsuite/xargs.posix/s47.exp
delete mode 100644 xargs/testsuite/xargs.posix/s47.xo
create mode 100644 xargs/testsuite/xargs.sysv/s25-t.exp
create mode 100644 xargs/testsuite/xargs.sysv/s25-t.xe
create mode 100644 xargs/testsuite/xargs.sysv/s25-t.xo
delete mode 100644 xargs/testsuite/xargs.sysv/s30-t.exp
delete mode 100644 xargs/testsuite/xargs.sysv/s30-t.xe
delete mode 100644 xargs/testsuite/xargs.sysv/s30-t.xo
diff --git a/ChangeLog b/ChangeLog
index 9324199..2ce633d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2011-05-22 James Youngman <address@hidden>
+
+ * xargs/testsuite/xargs.sysv/empty_def-t.xe: Change /bin/echo to
+ echo.
+ * xargs/testsuite/xargs.gnu/n2-s26-x-0.exp: Change -s26 to -s21 to
+ keep the expected test result the same. Rename the test to
+ reflect the updated arguments.
+ * xargs/testsuite/xargs.gnu/n2-s26-x-0.xo: Rename to
+ n2-s21-x-0.xo.
+ * xargs/testsuite/xargs.gnu/n2-s26-0.exp: Rename to n2-s21-0.exp,
+ update -s argument.
+ * xargs/testsuite/xargs.posix/s30.exp: Rename to s25.exp, update -s.
+ * xargs/testsuite/xargs.posix/s30.xo: Rename to s25.xo.
+ * xargs/testsuite/xargs.gnu/s30-0.exp: Rename to s25-0.exp, update
+ -s argument.
+ * xargs/testsuite/xargs.gnu/s30-0.xo: Rename to s25-0.xo.
+ * xargs/testsuite/xargs.sysv/s30-t.exp: Rename to s25-t.exp,
+ update -s.
+ * xargs/testsuite/xargs.sysv/s30-t.xo: Rename to s25-t.xo.
+ * xargs/testsuite/xargs.sysv/s30-t.xe: Rename to s25-t.xe, change
+ /bin/echo to just echo.
+ * xargs/testsuite/xargs.posix/s47.exp: Rename to s42.exp, update -s.
+ * xargs/testsuite/xargs.posix/s47.xo: Rename to s42.xo.
+ * xargs/testsuite/xargs.gnu/n3-s36-0.exp: Rename to n3-s31-0.exp,
+ update -s.
+ * xargs/testsuite/xargs.gnu/n3-s36-0.xo: Rename to n3-s31-0.xo.
+ * xargs/testsuite/xargs.gnu/s20-0.exp: Rename to s15-0.exp, update
+ -s.
+ * xargs/testsuite/xargs.gnu/s20-0.xo: Rename to s15-0.xo.
+ * xargs/testsuite/xargs.posix/n2-s26.exp: Rename to n2-s21.exp,
+ update -s.
+ * xargs/testsuite/xargs.posix/n2-s26.xo: Rename to n2-s21.xo.
+ * xargs/testsuite/xargs.gnu/s19-0.exp: Rename to s14-0.exp, update
+ -s.
+ * xargs/testsuite/xargs.gnu/s19-0.xo: Rename to s14-0.xo.
+ * xargs/testsuite/xargs.gnu/s19_2-0.exp: Rename to s14_2-0.exp,
+ update -s.
+ * xargs/testsuite/xargs.gnu/s19_2-0.xo: Rename to s14_2-0.xo.
+ * xargs/testsuite/xargs.posix/n3-s36.exp: Rename to n3-s31.exp,
+ update -s.
+ * xargs/testsuite/xargs.posix/n3-s36.xo: Rename to n3-s31.xo.
+ * xargs/testsuite/xargs.posix/s19.exp: Rename to s14.exp, update
+ -s.
+ * xargs/testsuite/xargs.posix/s19.xo: Rename to s14.xo.
+ * xargs/testsuite/xargs.posix/s19_2.exp: Rename to s14_2.exp,
+ update -s.
+ * xargs/testsuite/xargs.posix/s19_2.xo: Rename to s14_2.xo.
+ * xargs/testsuite/xargs.posix/s20.exp: Rename to s15.exp,
+ update -s.
+ * xargs/testsuite/xargs.posix/s20.xo: Rename to s15.xo.
+ * xargs/testsuite/Makefile.am (EXTRA_DIST_XO): Update names.
+ (EXTRA_DIST_EXP): Likewise.
+
+ Don't assume that "echo" lives in /bin.
+ * xargs/xargs.c (main): Change default_cmd from "/bin/echo" (which
+ may not be present on some POSIX systems) to "echo" (which must
+ exist somewhere on $PATH on any POSIX system).
+ * doc/find.texi (Multiple Files): document this.
+ * NEWS: Describe this change.
+
2011-05-17 James Youngman <address@hidden>
Document ftsfind/oldfind and configure options.
diff --git a/NEWS b/NEWS
index c65e2b7..9ce7689 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,13 @@ installed, whichever is appropriate.
#32043: find -name [ doesn't obey posix
-** Functional Enhancements to xargs
+** Functional Changes to xargs
+
+If no utility is specified, xargs now calls "echo" (and searches on
+$PATH to find it) rather than "/bin/echo". This may give rise to
+subtle behaviour differences for some users. To avoid unexpected
+surprises, just explicitly specify the utility you would like to run.
+For example use "xargs /bin/echo < foo" rather than "xargs < foo".
A new option is provided, --process-slot-var. If you set this, xargs
will set the indicated environment variable in each child. The values
diff --git a/doc/find.texi b/doc/find.texi
index e40b61f..5d9b096 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -2203,7 +2203,7 @@ xargs @address@hidden@address@hidden @address@hidden
@address@hidden
@code{xargs} normally reads arguments from the standard input. These
arguments are delimited by blanks (which can be protected with double
or single quotes or a backslash) or newlines. It executes the
address@hidden (default is @file{/bin/echo}) one or more times with any
address@hidden (the default is @file{echo}) one or more times with any
@var{initial-arguments} followed by arguments read from standard
input. Blank lines on the standard input are ignored. If the
@samp{-L} option is in use, trailing blanks indicate that @code{xargs}
diff --git a/xargs/testsuite/Makefile.am b/xargs/testsuite/Makefile.am
index 8637d93..e5b6825 100644
--- a/xargs/testsuite/Makefile.am
+++ b/xargs/testsuite/Makefile.am
@@ -20,19 +20,19 @@ xargs.gnu/L2_2-0.exp \
xargs.gnu/L3-0.exp \
xargs.gnu/n1-0.exp \
xargs.gnu/n2-0.exp \
-xargs.gnu/n2-s26-0.exp \
-xargs.gnu/n2-s26-x-0.exp \
+xargs.gnu/n2-s21-0.exp \
+xargs.gnu/n2-s21-x-0.exp \
xargs.gnu/n3-0.exp \
-xargs.gnu/n3-s36-0.exp \
+xargs.gnu/n3-s31-0.exp \
xargs.gnu/noeof-0.exp \
xargs.gnu/nothing.exp \
xargs.gnu/P3-n1-IARG.exp \
xargs.gnu/r.exp \
xargs.gnu/s118-0.exp \
-xargs.gnu/s19-0.exp \
-xargs.gnu/s19_2-0.exp \
-xargs.gnu/s20-0.exp \
-xargs.gnu/s30-0.exp \
+xargs.gnu/s14_2-0.exp \
+xargs.gnu/s14-0.exp \
+xargs.gnu/s15-0.exp \
+xargs.gnu/s25-0.exp \
xargs.gnu/space-0.exp \
xargs.gnu/space-r.exp \
xargs.gnu/space-t-0.exp \
@@ -56,10 +56,10 @@ xargs.posix/L2-n2.exp \
xargs.posix/L3.exp \
xargs.posix/n1.exp \
xargs.posix/n2.exp \
-xargs.posix/n2-s26.exp \
-xargs.posix/n2-s26-x.exp \
+xargs.posix/n2-s21.exp \
+xargs.posix/n2-s21-x.exp \
xargs.posix/n3.exp \
-xargs.posix/n3-s36.exp \
+xargs.posix/n3-s31.exp \
xargs.posix/noeof.exp \
xargs.posix/quotes.exp \
xargs.posix/rc-123.exp \
@@ -68,12 +68,12 @@ xargs.posix/rc-125.exp \
xargs.posix/rc-126.exp \
xargs.posix/rc-127.exp \
xargs.posix/s118.exp \
-xargs.posix/s19_2.exp \
-xargs.posix/s19.exp \
-xargs.posix/s20.exp \
-xargs.posix/s30.exp \
+xargs.posix/s14.exp \
+xargs.posix/s14_2.exp \
+xargs.posix/s15.exp \
+xargs.posix/s25.exp \
+xargs.posix/s42.exp \
xargs.posix/s470.exp \
-xargs.posix/s47.exp \
xargs.posix/s48.exp \
xargs.posix/s6.exp \
xargs.posix/savannah-11865.exp \
@@ -98,7 +98,7 @@ xargs.sysv/l1_2.exp \
xargs.sysv/l1.exp \
xargs.sysv/l1n4.exp \
xargs.sysv/lc_l2.exp \
-xargs.sysv/s30-t.exp \
+xargs.sysv/s25-t.exp \
xargs.sysv/sv-bug-18713.exp \
xargs.sysv/space-t.exp \
xargs.sysv/trace.exp
@@ -118,18 +118,18 @@ xargs.gnu/L2_2-0.xo \
xargs.gnu/L3-0.xo \
xargs.gnu/n1-0.xo \
xargs.gnu/n2-0.xo \
-xargs.gnu/n2-s26-0.xo \
-xargs.gnu/n2-s26-x-0.xo \
+xargs.gnu/n2-s21-0.xo \
+xargs.gnu/n2-s21-x-0.xo \
xargs.gnu/n3-0.xo \
-xargs.gnu/n3-s36-0.xo \
+xargs.gnu/n3-s31-0.xo \
xargs.gnu/noeof-0.xo \
xargs.gnu/nothing.xo \
xargs.gnu/P3-n1-IARG.xo \
xargs.gnu/r.xo \
xargs.gnu/s118-0.xo \
-xargs.gnu/s19-0.xo \
-xargs.gnu/s20-0.xo \
-xargs.gnu/s30-0.xo \
+xargs.gnu/s14-0.xo \
+xargs.gnu/s15-0.xo \
+xargs.gnu/s25-0.xo \
xargs.gnu/space-0.xo \
xargs.gnu/space-t-0.xo \
xargs.posix/EEOFb.xo \
@@ -148,20 +148,20 @@ xargs.posix/L2-n2.xo \
xargs.posix/uc_L2.xo \
xargs.posix/L3.xo \
xargs.posix/n1.xo \
-xargs.posix/n2-s26.xo \
-xargs.posix/n2-s26-x.xo \
+xargs.posix/n2-s21.xo \
+xargs.posix/n2-s21-x.xo \
xargs.posix/n2.xo \
-xargs.posix/n3-s36.xo \
+xargs.posix/n3-s31.xo \
xargs.posix/n3.xo \
xargs.posix/noeof.xo \
xargs.posix/quotes.xo \
xargs.posix/rc-123.xo \
xargs.posix/s118.xo \
-xargs.posix/s19.xo \
-xargs.posix/s20.xo \
-xargs.posix/s30.xo \
+xargs.posix/s14.xo \
+xargs.posix/s15.xo \
+xargs.posix/s25.xo \
+xargs.posix/s42.xo \
xargs.posix/s470.xo \
-xargs.posix/s47.xo \
xargs.posix/s48.xo \
xargs.posix/savannah-11865.xo \
xargs.posix/space.xo \
@@ -183,7 +183,7 @@ xargs.sysv/l1_2.xo \
xargs.sysv/l1n4.xo \
xargs.sysv/l1.xo \
xargs.sysv/lc_l2.xo \
-xargs.sysv/s30-t.xo \
+xargs.sysv/s25-t.xo \
xargs.sysv/sv-bug-18713.xo \
xargs.sysv/space-t.xo \
xargs.sysv/trace.xo
@@ -194,7 +194,7 @@ EXTRA_DIST_XE = \
xargs.gnu/space-t-0.xe \
xargs.sysv/empty_def-t.xe \
xargs.sysv/empty-t.xe \
-xargs.sysv/s30-t.xe \
+xargs.sysv/s25-t.xe \
xargs.sysv/space-t.xe \
xargs.sysv/trace.xe
diff --git a/xargs/testsuite/xargs.gnu/n2-s21-0.exp
b/xargs/testsuite/xargs.gnu/n2-s21-0.exp
new file mode 100644
index 0000000..1793245
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/n2-s21-0.exp
@@ -0,0 +1 @@
+xargs_start p {-n2 -s21 -0} stairs-0.xi
diff --git a/xargs/testsuite/xargs.gnu/n2-s21-0.xo
b/xargs/testsuite/xargs.gnu/n2-s21-0.xo
new file mode 100644
index 0000000..a9e8dfa
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/n2-s21-0.xo
@@ -0,0 +1,11 @@
+1 22
+333 4444
+55555 666666
+7777777
+88888888
+999999999 1
+22 333
+4444 55555
+666666 7777777
+88888888
+999999999
diff --git a/xargs/testsuite/xargs.gnu/n2-s21-x-0.exp
b/xargs/testsuite/xargs.gnu/n2-s21-x-0.exp
new file mode 100644
index 0000000..293ba88
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/n2-s21-x-0.exp
@@ -0,0 +1 @@
+xargs_start f {-n2 -s21 -x -0} stairs-0.xi skip
diff --git a/xargs/testsuite/xargs.gnu/n2-s21-x-0.xo
b/xargs/testsuite/xargs.gnu/n2-s21-x-0.xo
new file mode 100644
index 0000000..7b6db82
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/n2-s21-x-0.xo
@@ -0,0 +1,3 @@
+1 22
+333 4444
+55555 666666
diff --git a/xargs/testsuite/xargs.gnu/n2-s26-0.exp
b/xargs/testsuite/xargs.gnu/n2-s26-0.exp
deleted file mode 100644
index 4494905..0000000
--- a/xargs/testsuite/xargs.gnu/n2-s26-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-n2 -s26 -0} stairs-0.xi
diff --git a/xargs/testsuite/xargs.gnu/n2-s26-0.xo
b/xargs/testsuite/xargs.gnu/n2-s26-0.xo
deleted file mode 100644
index a9e8dfa..0000000
--- a/xargs/testsuite/xargs.gnu/n2-s26-0.xo
+++ /dev/null
@@ -1,11 +0,0 @@
-1 22
-333 4444
-55555 666666
-7777777
-88888888
-999999999 1
-22 333
-4444 55555
-666666 7777777
-88888888
-999999999
diff --git a/xargs/testsuite/xargs.gnu/n2-s26-x-0.exp
b/xargs/testsuite/xargs.gnu/n2-s26-x-0.exp
deleted file mode 100644
index f765bcd..0000000
--- a/xargs/testsuite/xargs.gnu/n2-s26-x-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-n2 -s26 -x -0} stairs-0.xi skip
diff --git a/xargs/testsuite/xargs.gnu/n2-s26-x-0.xo
b/xargs/testsuite/xargs.gnu/n2-s26-x-0.xo
deleted file mode 100644
index 7b6db82..0000000
--- a/xargs/testsuite/xargs.gnu/n2-s26-x-0.xo
+++ /dev/null
@@ -1,3 +0,0 @@
-1 22
-333 4444
-55555 666666
diff --git a/xargs/testsuite/xargs.gnu/n3-s31-0.exp
b/xargs/testsuite/xargs.gnu/n3-s31-0.exp
new file mode 100644
index 0000000..efee3e3
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/n3-s31-0.exp
@@ -0,0 +1 @@
+xargs_start p {-n3 -s31 -0} stairs2-0.xi
diff --git a/xargs/testsuite/xargs.gnu/n3-s31-0.xo
b/xargs/testsuite/xargs.gnu/n3-s31-0.xo
new file mode 100644
index 0000000..7484486
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/n3-s31-0.xo
@@ -0,0 +1,7 @@
+999999999 88888888
+7777777 666666 55555
+4444 333 22
+1 999999999 88888888
+7777777 666666 55555
+4444 333 22
+1
diff --git a/xargs/testsuite/xargs.gnu/n3-s36-0.exp
b/xargs/testsuite/xargs.gnu/n3-s36-0.exp
deleted file mode 100644
index 1d83e26..0000000
--- a/xargs/testsuite/xargs.gnu/n3-s36-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-n3 -s36 -0} stairs2-0.xi
diff --git a/xargs/testsuite/xargs.gnu/n3-s36-0.xo
b/xargs/testsuite/xargs.gnu/n3-s36-0.xo
deleted file mode 100644
index 7484486..0000000
--- a/xargs/testsuite/xargs.gnu/n3-s36-0.xo
+++ /dev/null
@@ -1,7 +0,0 @@
-999999999 88888888
-7777777 666666 55555
-4444 333 22
-1 999999999 88888888
-7777777 666666 55555
-4444 333 22
-1
diff --git a/xargs/testsuite/xargs.gnu/s14-0.exp
b/xargs/testsuite/xargs.gnu/s14-0.exp
new file mode 100644
index 0000000..9c4d841
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s14-0.exp
@@ -0,0 +1 @@
+xargs_start f {-0 -s14} stairs-0.xi skip
diff --git a/xargs/testsuite/xargs.gnu/s14-0.xo
b/xargs/testsuite/xargs.gnu/s14-0.xo
new file mode 100644
index 0000000..afb3bc3
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s14-0.xo
@@ -0,0 +1,6 @@
+1 22 333
+4444
+55555
+666666
+7777777
+88888888
diff --git a/xargs/testsuite/xargs.gnu/s14_2-0.exp
b/xargs/testsuite/xargs.gnu/s14_2-0.exp
new file mode 100644
index 0000000..63a7603
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s14_2-0.exp
@@ -0,0 +1 @@
+xargs_start f {-0 -s14} stairs2-0.xi skip
diff --git a/xargs/testsuite/xargs.gnu/s15-0.exp
b/xargs/testsuite/xargs.gnu/s15-0.exp
new file mode 100644
index 0000000..f67a18e
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s15-0.exp
@@ -0,0 +1 @@
+xargs_start p {-0 -s15} stairs-0.xi
diff --git a/xargs/testsuite/xargs.gnu/s15-0.xo
b/xargs/testsuite/xargs.gnu/s15-0.xo
new file mode 100644
index 0000000..7f7032e
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s15-0.xo
@@ -0,0 +1,14 @@
+1 22 333
+4444
+55555
+666666
+7777777
+88888888
+999999999
+1 22 333
+4444
+55555
+666666
+7777777
+88888888
+999999999
diff --git a/xargs/testsuite/xargs.gnu/s19-0.exp
b/xargs/testsuite/xargs.gnu/s19-0.exp
deleted file mode 100644
index 7f4f153..0000000
--- a/xargs/testsuite/xargs.gnu/s19-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-0 -s19} stairs-0.xi skip
diff --git a/xargs/testsuite/xargs.gnu/s19-0.xo
b/xargs/testsuite/xargs.gnu/s19-0.xo
deleted file mode 100644
index afb3bc3..0000000
--- a/xargs/testsuite/xargs.gnu/s19-0.xo
+++ /dev/null
@@ -1,6 +0,0 @@
-1 22 333
-4444
-55555
-666666
-7777777
-88888888
diff --git a/xargs/testsuite/xargs.gnu/s19_2-0.exp
b/xargs/testsuite/xargs.gnu/s19_2-0.exp
deleted file mode 100644
index 78c460a..0000000
--- a/xargs/testsuite/xargs.gnu/s19_2-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-0 -s19} stairs2-0.xi skip
diff --git a/xargs/testsuite/xargs.gnu/s20-0.exp
b/xargs/testsuite/xargs.gnu/s20-0.exp
deleted file mode 100644
index 899fd10..0000000
--- a/xargs/testsuite/xargs.gnu/s20-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-0 -s20} stairs-0.xi
diff --git a/xargs/testsuite/xargs.gnu/s20-0.xo
b/xargs/testsuite/xargs.gnu/s20-0.xo
deleted file mode 100644
index 7f7032e..0000000
--- a/xargs/testsuite/xargs.gnu/s20-0.xo
+++ /dev/null
@@ -1,14 +0,0 @@
-1 22 333
-4444
-55555
-666666
-7777777
-88888888
-999999999
-1 22 333
-4444
-55555
-666666
-7777777
-88888888
-999999999
diff --git a/xargs/testsuite/xargs.gnu/s25-0.exp
b/xargs/testsuite/xargs.gnu/s25-0.exp
new file mode 100644
index 0000000..61a026c
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s25-0.exp
@@ -0,0 +1 @@
+xargs_start p {-0 -s25} stairs-0.xi
diff --git a/xargs/testsuite/xargs.gnu/s25-0.xo
b/xargs/testsuite/xargs.gnu/s25-0.xo
new file mode 100644
index 0000000..64ba7cb
--- /dev/null
+++ b/xargs/testsuite/xargs.gnu/s25-0.xo
@@ -0,0 +1,6 @@
+1 22 333 4444 55555
+666666 7777777
+88888888 999999999
+1 22 333 4444 55555
+666666 7777777
+88888888 999999999
diff --git a/xargs/testsuite/xargs.gnu/s30-0.exp
b/xargs/testsuite/xargs.gnu/s30-0.exp
deleted file mode 100644
index 5111b78..0000000
--- a/xargs/testsuite/xargs.gnu/s30-0.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-0 -s30} stairs-0.xi
diff --git a/xargs/testsuite/xargs.gnu/s30-0.xo
b/xargs/testsuite/xargs.gnu/s30-0.xo
deleted file mode 100644
index 64ba7cb..0000000
--- a/xargs/testsuite/xargs.gnu/s30-0.xo
+++ /dev/null
@@ -1,6 +0,0 @@
-1 22 333 4444 55555
-666666 7777777
-88888888 999999999
-1 22 333 4444 55555
-666666 7777777
-88888888 999999999
diff --git a/xargs/testsuite/xargs.posix/n2-s21-x.exp
b/xargs/testsuite/xargs.posix/n2-s21-x.exp
new file mode 100644
index 0000000..5f799a9
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/n2-s21-x.exp
@@ -0,0 +1 @@
+xargs_start f {-n2 -s21 -x} stairs.xi skip
diff --git a/xargs/testsuite/xargs.posix/n2-s21-x.xo
b/xargs/testsuite/xargs.posix/n2-s21-x.xo
new file mode 100644
index 0000000..7b6db82
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/n2-s21-x.xo
@@ -0,0 +1,3 @@
+1 22
+333 4444
+55555 666666
diff --git a/xargs/testsuite/xargs.posix/n2-s21.exp
b/xargs/testsuite/xargs.posix/n2-s21.exp
new file mode 100644
index 0000000..61cb60b
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/n2-s21.exp
@@ -0,0 +1 @@
+xargs_start p {-n2 -s21} stairs.xi
diff --git a/xargs/testsuite/xargs.posix/n2-s21.xo
b/xargs/testsuite/xargs.posix/n2-s21.xo
new file mode 100644
index 0000000..a9e8dfa
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/n2-s21.xo
@@ -0,0 +1,11 @@
+1 22
+333 4444
+55555 666666
+7777777
+88888888
+999999999 1
+22 333
+4444 55555
+666666 7777777
+88888888
+999999999
diff --git a/xargs/testsuite/xargs.posix/n2-s26-x.exp
b/xargs/testsuite/xargs.posix/n2-s26-x.exp
deleted file mode 100644
index fd59c05..0000000
--- a/xargs/testsuite/xargs.posix/n2-s26-x.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-n2 -s26 -x} stairs.xi skip
diff --git a/xargs/testsuite/xargs.posix/n2-s26-x.xo
b/xargs/testsuite/xargs.posix/n2-s26-x.xo
deleted file mode 100644
index 7b6db82..0000000
--- a/xargs/testsuite/xargs.posix/n2-s26-x.xo
+++ /dev/null
@@ -1,3 +0,0 @@
-1 22
-333 4444
-55555 666666
diff --git a/xargs/testsuite/xargs.posix/n2-s26.exp
b/xargs/testsuite/xargs.posix/n2-s26.exp
deleted file mode 100644
index ba76660..0000000
--- a/xargs/testsuite/xargs.posix/n2-s26.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-n2 -s26} stairs.xi
diff --git a/xargs/testsuite/xargs.posix/n2-s26.xo
b/xargs/testsuite/xargs.posix/n2-s26.xo
deleted file mode 100644
index a9e8dfa..0000000
--- a/xargs/testsuite/xargs.posix/n2-s26.xo
+++ /dev/null
@@ -1,11 +0,0 @@
-1 22
-333 4444
-55555 666666
-7777777
-88888888
-999999999 1
-22 333
-4444 55555
-666666 7777777
-88888888
-999999999
diff --git a/xargs/testsuite/xargs.posix/n3-s31.exp
b/xargs/testsuite/xargs.posix/n3-s31.exp
new file mode 100644
index 0000000..a49943e
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/n3-s31.exp
@@ -0,0 +1 @@
+xargs_start p {-n3 -s31} stairs2.xi
diff --git a/xargs/testsuite/xargs.posix/n3-s31.xo
b/xargs/testsuite/xargs.posix/n3-s31.xo
new file mode 100644
index 0000000..7484486
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/n3-s31.xo
@@ -0,0 +1,7 @@
+999999999 88888888
+7777777 666666 55555
+4444 333 22
+1 999999999 88888888
+7777777 666666 55555
+4444 333 22
+1
diff --git a/xargs/testsuite/xargs.posix/n3-s36.exp
b/xargs/testsuite/xargs.posix/n3-s36.exp
deleted file mode 100644
index 00c80e9..0000000
--- a/xargs/testsuite/xargs.posix/n3-s36.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-n3 -s36} stairs2.xi
diff --git a/xargs/testsuite/xargs.posix/n3-s36.xo
b/xargs/testsuite/xargs.posix/n3-s36.xo
deleted file mode 100644
index 7484486..0000000
--- a/xargs/testsuite/xargs.posix/n3-s36.xo
+++ /dev/null
@@ -1,7 +0,0 @@
-999999999 88888888
-7777777 666666 55555
-4444 333 22
-1 999999999 88888888
-7777777 666666 55555
-4444 333 22
-1
diff --git a/xargs/testsuite/xargs.posix/s14.exp
b/xargs/testsuite/xargs.posix/s14.exp
new file mode 100644
index 0000000..22b8188
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s14.exp
@@ -0,0 +1 @@
+xargs_start f {-s14} stairs.xi skip
diff --git a/xargs/testsuite/xargs.posix/s14.xo
b/xargs/testsuite/xargs.posix/s14.xo
new file mode 100644
index 0000000..afb3bc3
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s14.xo
@@ -0,0 +1,6 @@
+1 22 333
+4444
+55555
+666666
+7777777
+88888888
diff --git a/xargs/testsuite/xargs.posix/s14_2.exp
b/xargs/testsuite/xargs.posix/s14_2.exp
new file mode 100644
index 0000000..2a0470b
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s14_2.exp
@@ -0,0 +1 @@
+xargs_start f {-s14} stairs2.xi skip
diff --git a/xargs/testsuite/xargs.posix/s15.exp
b/xargs/testsuite/xargs.posix/s15.exp
new file mode 100644
index 0000000..6576fa8
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s15.exp
@@ -0,0 +1 @@
+xargs_start p {-s15} stairs.xi
diff --git a/xargs/testsuite/xargs.posix/s15.xo
b/xargs/testsuite/xargs.posix/s15.xo
new file mode 100644
index 0000000..7f7032e
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s15.xo
@@ -0,0 +1,14 @@
+1 22 333
+4444
+55555
+666666
+7777777
+88888888
+999999999
+1 22 333
+4444
+55555
+666666
+7777777
+88888888
+999999999
diff --git a/xargs/testsuite/xargs.posix/s19.exp
b/xargs/testsuite/xargs.posix/s19.exp
deleted file mode 100644
index 86f9337..0000000
--- a/xargs/testsuite/xargs.posix/s19.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-s19} stairs.xi skip
diff --git a/xargs/testsuite/xargs.posix/s19.xo
b/xargs/testsuite/xargs.posix/s19.xo
deleted file mode 100644
index afb3bc3..0000000
--- a/xargs/testsuite/xargs.posix/s19.xo
+++ /dev/null
@@ -1,6 +0,0 @@
-1 22 333
-4444
-55555
-666666
-7777777
-88888888
diff --git a/xargs/testsuite/xargs.posix/s19_2.exp
b/xargs/testsuite/xargs.posix/s19_2.exp
deleted file mode 100644
index be27aef..0000000
--- a/xargs/testsuite/xargs.posix/s19_2.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-s19} stairs2.xi skip
diff --git a/xargs/testsuite/xargs.posix/s20.exp
b/xargs/testsuite/xargs.posix/s20.exp
deleted file mode 100644
index f87d441..0000000
--- a/xargs/testsuite/xargs.posix/s20.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-s20} stairs.xi
diff --git a/xargs/testsuite/xargs.posix/s20.xo
b/xargs/testsuite/xargs.posix/s20.xo
deleted file mode 100644
index 7f7032e..0000000
--- a/xargs/testsuite/xargs.posix/s20.xo
+++ /dev/null
@@ -1,14 +0,0 @@
-1 22 333
-4444
-55555
-666666
-7777777
-88888888
-999999999
-1 22 333
-4444
-55555
-666666
-7777777
-88888888
-999999999
diff --git a/xargs/testsuite/xargs.posix/s25.exp
b/xargs/testsuite/xargs.posix/s25.exp
new file mode 100644
index 0000000..ac3ba41
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s25.exp
@@ -0,0 +1 @@
+xargs_start p {-s25} stairs.xi
diff --git a/xargs/testsuite/xargs.posix/s25.xo
b/xargs/testsuite/xargs.posix/s25.xo
new file mode 100644
index 0000000..64ba7cb
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s25.xo
@@ -0,0 +1,6 @@
+1 22 333 4444 55555
+666666 7777777
+88888888 999999999
+1 22 333 4444 55555
+666666 7777777
+88888888 999999999
diff --git a/xargs/testsuite/xargs.posix/s30.exp
b/xargs/testsuite/xargs.posix/s30.exp
deleted file mode 100644
index 9faa71b..0000000
--- a/xargs/testsuite/xargs.posix/s30.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-s30} stairs.xi
diff --git a/xargs/testsuite/xargs.posix/s30.xo
b/xargs/testsuite/xargs.posix/s30.xo
deleted file mode 100644
index 64ba7cb..0000000
--- a/xargs/testsuite/xargs.posix/s30.xo
+++ /dev/null
@@ -1,6 +0,0 @@
-1 22 333 4444 55555
-666666 7777777
-88888888 999999999
-1 22 333 4444 55555
-666666 7777777
-88888888 999999999
diff --git a/xargs/testsuite/xargs.posix/s42.exp
b/xargs/testsuite/xargs.posix/s42.exp
new file mode 100644
index 0000000..5f50ae0
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s42.exp
@@ -0,0 +1 @@
+xargs_start f {-s42} files.xi skip
diff --git a/xargs/testsuite/xargs.posix/s42.xo
b/xargs/testsuite/xargs.posix/s42.xo
new file mode 100644
index 0000000..26eed8f
--- /dev/null
+++ b/xargs/testsuite/xargs.posix/s42.xo
@@ -0,0 +1,18 @@
+/src/gnu/autoconf-1.11
+/src/gnu/autoconf-1.11/README
+/src/gnu/autoconf-1.11/Makefile.in
+/src/gnu/autoconf-1.11/INSTALL
+/src/gnu/autoconf-1.11/NEWS
+/src/gnu/autoconf-1.11/COPYING
+/src/gnu/autoconf-1.11/ChangeLog
+/src/gnu/autoconf-1.11/autoconf.texi
+/src/gnu/autoconf-1.11/acconfig.h
+/src/gnu/autoconf-1.11/autoconf.sh
+/src/gnu/autoconf-1.11/acgeneral.m4
+/src/gnu/autoconf-1.11/acspecific.m4
+/src/gnu/autoconf-1.11/configure
+/src/gnu/autoconf-1.11/configure.in
+/src/gnu/autoconf-1.11/autoheader.sh
+/src/gnu/autoconf-1.11/mkinstalldirs
+/src/gnu/autoconf-1.11/install.sh
+/src/gnu/autoconf-1.11/autoconf.info
diff --git a/xargs/testsuite/xargs.posix/s47.exp
b/xargs/testsuite/xargs.posix/s47.exp
deleted file mode 100644
index 8f79b2a..0000000
--- a/xargs/testsuite/xargs.posix/s47.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start f {-s47} files.xi skip
diff --git a/xargs/testsuite/xargs.posix/s47.xo
b/xargs/testsuite/xargs.posix/s47.xo
deleted file mode 100644
index 26eed8f..0000000
--- a/xargs/testsuite/xargs.posix/s47.xo
+++ /dev/null
@@ -1,18 +0,0 @@
-/src/gnu/autoconf-1.11
-/src/gnu/autoconf-1.11/README
-/src/gnu/autoconf-1.11/Makefile.in
-/src/gnu/autoconf-1.11/INSTALL
-/src/gnu/autoconf-1.11/NEWS
-/src/gnu/autoconf-1.11/COPYING
-/src/gnu/autoconf-1.11/ChangeLog
-/src/gnu/autoconf-1.11/autoconf.texi
-/src/gnu/autoconf-1.11/acconfig.h
-/src/gnu/autoconf-1.11/autoconf.sh
-/src/gnu/autoconf-1.11/acgeneral.m4
-/src/gnu/autoconf-1.11/acspecific.m4
-/src/gnu/autoconf-1.11/configure
-/src/gnu/autoconf-1.11/configure.in
-/src/gnu/autoconf-1.11/autoheader.sh
-/src/gnu/autoconf-1.11/mkinstalldirs
-/src/gnu/autoconf-1.11/install.sh
-/src/gnu/autoconf-1.11/autoconf.info
diff --git a/xargs/testsuite/xargs.sysv/empty_def-t.xe
b/xargs/testsuite/xargs.sysv/empty_def-t.xe
index da4ae85..1aa4903 100644
--- a/xargs/testsuite/xargs.sysv/empty_def-t.xe
+++ b/xargs/testsuite/xargs.sysv/empty_def-t.xe
@@ -1 +1 @@
-/bin/echo
+echo
diff --git a/xargs/testsuite/xargs.sysv/s25-t.exp
b/xargs/testsuite/xargs.sysv/s25-t.exp
new file mode 100644
index 0000000..9199880
--- /dev/null
+++ b/xargs/testsuite/xargs.sysv/s25-t.exp
@@ -0,0 +1 @@
+xargs_start p {-s25 -t} stairs.xi
diff --git a/xargs/testsuite/xargs.sysv/s25-t.xe
b/xargs/testsuite/xargs.sysv/s25-t.xe
new file mode 100644
index 0000000..5659900
--- /dev/null
+++ b/xargs/testsuite/xargs.sysv/s25-t.xe
@@ -0,0 +1,6 @@
+echo 1 22 333 4444 55555
+echo 666666 7777777
+echo 88888888 999999999
+echo 1 22 333 4444 55555
+echo 666666 7777777
+echo 88888888 999999999
diff --git a/xargs/testsuite/xargs.sysv/s25-t.xo
b/xargs/testsuite/xargs.sysv/s25-t.xo
new file mode 100644
index 0000000..64ba7cb
--- /dev/null
+++ b/xargs/testsuite/xargs.sysv/s25-t.xo
@@ -0,0 +1,6 @@
+1 22 333 4444 55555
+666666 7777777
+88888888 999999999
+1 22 333 4444 55555
+666666 7777777
+88888888 999999999
diff --git a/xargs/testsuite/xargs.sysv/s30-t.exp
b/xargs/testsuite/xargs.sysv/s30-t.exp
deleted file mode 100644
index 4145c8d..0000000
--- a/xargs/testsuite/xargs.sysv/s30-t.exp
+++ /dev/null
@@ -1 +0,0 @@
-xargs_start p {-s30 -t} stairs.xi
diff --git a/xargs/testsuite/xargs.sysv/s30-t.xe
b/xargs/testsuite/xargs.sysv/s30-t.xe
deleted file mode 100644
index f91bf78..0000000
--- a/xargs/testsuite/xargs.sysv/s30-t.xe
+++ /dev/null
@@ -1,6 +0,0 @@
-/bin/echo 1 22 333 4444 55555
-/bin/echo 666666 7777777
-/bin/echo 88888888 999999999
-/bin/echo 1 22 333 4444 55555
-/bin/echo 666666 7777777
-/bin/echo 88888888 999999999
diff --git a/xargs/testsuite/xargs.sysv/s30-t.xo
b/xargs/testsuite/xargs.sysv/s30-t.xo
deleted file mode 100644
index 64ba7cb..0000000
--- a/xargs/testsuite/xargs.sysv/s30-t.xo
+++ /dev/null
@@ -1,6 +0,0 @@
-1 22 333 4444 55555
-666666 7777777
-88888888 999999999
-1 22 333 4444 55555
-666666 7777777
-88888888 999999999
diff --git a/xargs/xargs.c b/xargs/xargs.c
index 219b09f..4a773e3 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
@@ -383,7 +383,7 @@ main (int argc, char **argv)
int show_limits = 0; /* --show-limits */
int always_run_command = 1;
char *input_file = "-"; /* "-" is stdin */
- char *default_cmd = "/bin/echo";
+ char *default_cmd = "echo";
int (*read_args) (void) = read_line;
void (*act_on_init_result)(void) = noop;
enum BC_INIT_STATUS bcstatus;
--
1.7.2.5
- [PATCH] Don't assume that "echo" lives in /bin.,
James Youngman <=