From: Phil Pennock <pdp@exim.org>
Date: Fri, 30 Mar 2012 20:52:17 +0000 (-0700)
Subject: Handle alternate access method flag in ls.
X-Git-Tag: exim-4_80_RC1~73
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/c1e49b796a61a19bc61e8c6349e90614690189a0

Handle alternate access method flag in ls.

Jeremy Harris found ls output not parsing on SELinux systems.  I
identified this as SUSv3's "optional alternate access method flag".
Jeremy wrote the patch, I adjusted a little.

fixes bug 1226
---

diff --git a/test/runtest b/test/runtest
index 4543915b0..2a8dd160c 100755
--- a/test/runtest
+++ b/test/runtest
@@ -593,7 +593,12 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   # ======== Output from ls ========
   # Different operating systems use different spacing on long output
-  s/ +/ /g if /^[-rwd]{10} /;
+  #s/ +/ /g if /^[-rwd]{10} /;
+  # (Bug 1226) SUSv3 allows a trailing printable char for modified access method control.
+  # 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 /;
 
 
   # ======== Message sizes =========