[exim-cvs] Better ls output fixing.

Top Page

Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Better ls output fixing.
Gitweb: http://git.exim.org/exim.git/commitdiff/8dfac75958fa63fcc463075742f99ec6b1297b64
Commit:     8dfac75958fa63fcc463075742f99ec6b1297b64
Parent:     2dc40d89a2b1dbde4a318ca9ef77cbcdce600e9c
Author:     Phil Pennock <pdp@???>
AuthorDate: Sun Apr 22 20:20:16 2012 -0700
Committer:  Phil Pennock <pdp@???>
CommitDate: Sun Apr 22 20:20:16 2012 -0700


    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.
---
 test/runtest |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/test/runtest b/test/runtest
index c199539..69c6931 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 =========