From: Jim Meyering <jim@meyering.net>
Date: Mon, 8 Dec 2003 09:04:48 +0000 (+0000)
Subject: Don't assume that 'ls' output is fixed-width.
X-Git-Tag: v5.1.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91adac3eabddeb2b8d1e27679d65d92678f13c54;p=thirdparty%2Fcoreutils.git

Don't assume that 'ls' output is fixed-width.
---

diff --git a/tests/cp/same-file b/tests/cp/same-file
index 4f9349ef5a..de5cf61ca5 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -74,11 +74,10 @@ for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do
 	# and put brackets around the output.
 	test -s _err && echo "[`sed 's/^[^:][^:]*:/cp:/' _err`]"
 	# Strip off all but the file names.
-	# Omit the variable-width owner and group names.
 	ls="`ls -gG --ignore=_err . \
 	    | sed \
 	        -e '/^total /d' \
-		-e 's/^......................................//'`"
+		-e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
 	echo "($ls)"
 	# Make sure the original is unchanged and that
 	# the destination is a copy.