From: Phil Pennock <pdp@exim.org>
Date: Mon, 23 Apr 2012 03:20:16 +0000 (-0700)
Subject: Better ls output fixing.
X-Git-Tag: exim-4_80_RC1~61
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8dfac75958fa63fcc463075742f99ec6b1297b64;p=exim.git

Better ls output fixing.

fixes bug 1226
Further investigation from Jeremy Harris showed the previous fix
left trailing whitespace on output which previously ended after
the permission bits (eg, test 0240).

This works better for me.
---

diff --git a/test/runtest b/test/runtest
index c199539a5..69c6931b0 100755
--- a/test/runtest
+++ b/test/runtest
@@ -598,7 +598,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   # Handle only the Gnu and MacOS space, dot, plus and at-sign.  A full [[:graph:]]
   # unfortunately matches a non-ls linefull of dashes.
   # Allow the case where we've already picked out the file protection bits.
-  s/^([-d](?:[-r][-w][-SsTtx]){3})[.+@]?( +|$)/\1 /;
+  if (s/^([-d](?:[-r][-w][-SsTtx]){3})[.+@]?( +|$)/\1\2/) {
+    s/ +/ /g;
+  }
 
 
   # ======== Message sizes =========