summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-04-22 20:20:16 -0700
committerPhil Pennock <pdp@exim.org>2012-04-22 20:20:16 -0700
commit8dfac75958fa63fcc463075742f99ec6b1297b64 (patch)
tree23ff540da31a986ff4b3ab7430d3083e57cebd24
parent2dc40d89a2b1dbde4a318ca9ef77cbcdce600e9c (diff)
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.
-rwxr-xr-xtest/runtest4
1 files changed, 3 insertions, 1 deletions
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 =========