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

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

diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index ccceee511e..e009b84492 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -108,13 +108,13 @@ for copy in cp mv; do
 		  -e '/^total /d' \
 		  -e s,$other_partition_tmpdir/,, \
 		  -e s,$pwd_tmp/,, \
-		  -e 's/^......................................//'`"
+		  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
 	  ls2="`cd $other_partition_tmpdir && ls -gG --ignore=.err . \
 	      | sed \
 		  -e '/^total /d' \
 		  -e s,$other_partition_tmpdir/,, \
 		  -e s,$pwd_tmp/,, \
-		  -e 's/^......................................//'`"
+		  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
 	  echo "($ls) ($ls2)"
 
 	  # If the command failed, then it must not have changed the files.