From: Wayne Davison <wayned@samba.org>
Date: Tue, 14 Oct 2008 14:27:56 +0000 (-0700)
Subject: Added another file-list filter to handle odd-ball systems that don't
X-Git-Tag: v3.0.5pre2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9189e41f6e2a4afa88cec8b89089401f437818a9;p=thirdparty%2Frsync.git

Added another file-list filter to handle odd-ball systems that don't
seem to size their sprintf() fields correctly.
---

diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 113d6a59..8d224bb9 100644
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -25,6 +25,7 @@ chkfile="$scratchdir/rsync.chk"
 outfile="$scratchdir/rsync.out"
 
 SSH="src/support/lsh --no-cd"
+FILE_REPL='s/^\([^d][^ ]*\) *\(..........[0-9]\) /\1 \2 /'
 DIR_REPL='s/^\(d[^ ]*\)  *[0-9][0-9]* /\1         DIR /'
 LS_REPL='s;[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9];####/##/## ##:##:##;'
 
@@ -65,7 +66,7 @@ EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
 
 $RSYNC -r localhost::test-hidden \
-    | sed "$DIR_REPL" | sed "$LS_REPL" \
+    | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \
     | tee "$outfile"
 cat <<EOT >"$chkfile"
 drwxr-xr-x         DIR ####/##/## ##:##:## .
@@ -79,7 +80,7 @@ EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
 
 $RSYNC -r localhost::test-from/f* \
-    | sed "$DIR_REPL" | sed "$LS_REPL" \
+    | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \
     | tee "$outfile"
 cat <<EOT >"$chkfile"
 drwxr-xr-x         DIR ####/##/## ##:##:## foo