From c1e49b796a61a19bc61e8c6349e90614690189a0 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Fri, 30 Mar 2012 13:52:17 -0700 Subject: [PATCH] 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 --- test/runtest | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 ========= -- 2.30.2