. "$suitedir/rsync.fns"
-case "$RSYNC" in
-*protocol=29*)
- sed_cmd='/_P30_/d; s/_P29_//'
- ;;
-*)
- sed_cmd='/_P29_/d; s/_P30_//'
- ;;
-esac
-
to2dir="$tmpdir/to2"
chkfile="$scratchdir/rsync.chk"
ln -s ../bar/baz/rsync "$fromdir/foo/sym"
umask 022
ln "$fromdir/foo/config1" "$fromdir/foo/extra"
+rm -f "$to2dir"
-# Check if the OS can hard-link symlinks or not
-ln -s no-such-dir "$to2dir"
-if ln "$to2dir" "$to2dir.test" 2>/dev/null; then
+# Check if rsync is set to hard-link symlinks.
+if egrep '^#define CAN_HARDLINK_SYMLINK 1' config.h >/dev/null; then
L=hL
else
L=cL
fi
-rm -f "$to2dir" "$to2dir.test"
+
+# Check if rsync can preserve time on symlinks
+case "$RSYNC" in
+*protocol=2*)
+ T=.T
+ ;;
+*)
+ if $RSYNC --version | grep ", symtimes" >/dev/null; then
+ T=.t
+ else
+ T=.T
+ fi
+ ;;
+esac
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-cd+++++++++ ./
-cd+++++++++ bar/
-cd+++++++++ foo/_P30_
-cd+++++++++ bar/baz/
->f+++++++++ bar/baz/rsync
-cd+++++++++ foo/_P29_
->f+++++++++ foo/config1
->f+++++++++ foo/config2
->f+++++++++ foo/extra
-cL+++++++++ foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$chkfile"
+cd$all_plus ./
+cd$all_plus bar/
+cd$all_plus bar/baz/
+>f$all_plus bar/baz/rsync
+cd$all_plus foo/
+>f$all_plus foo/config1
+>f$all_plus foo/config2
+>f$all_plus foo/extra
+cL$all_plus foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
chmod 601 "$fromdir/foo/config2"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
->f..T...... bar/baz/rsync
->f..T...... foo/config1
->f.sTp..... foo/config2
-hf..T...... foo/extra => foo/config1
+cat <<EOT >"$chkfile"
+>f..T.$dots bar/baz/rsync
+>f..T.$dots foo/config1
+>f.sTp$dots foo/config2
+hf..T.$dots foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-.d..t...... foo/_P30_
-.f..tp..... bar/baz/rsync
-.d..t...... foo/_P29_
-.f..t...... foo/config1
->fcstp..... foo/config2
-cL..T...... foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$chkfile"
+.f..tp$dots bar/baz/rsync
+.d..t.$dots foo/
+.f..t.$dots foo/config1
+>fcstp$dots foo/config2
+cLc$T.$dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
$RSYNC -vvplrH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
bar/baz/rsync is uptodate
foo/config1 is uptodate
-foo/config2
foo/extra is uptodate
foo/sym is uptodate
+foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-.d ./
-.d bar/
-.d bar/baz/
-.f...p..... bar/baz/rsync
-.d foo/
-.f foo/config1
->f..t...... foo/config2
-hf foo/extra
-.L foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$chkfile"
+.d$allspace ./
+.d$allspace bar/
+.d$allspace bar/baz/
+.f...p$dots bar/baz/rsync
+.d$allspace foo/
+.f$allspace foo/config1
+>f..t.$dots foo/config2
+hf$allspace foo/extra
+.L$allspace foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
$RSYNC -vplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
touch "$todir/foo/config2"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-.f...p..... foo/config1
->f..t...... foo/config2
+cat <<EOT >"$chkfile"
+.f...p$dots foo/config1
+>f..t.$dots foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-cd ./
-cd bar/
-cd bar/baz/
-cf bar/baz/rsync
-cd foo/
-cf foo/config1
-cf foo/config2
-hf foo/extra => foo/config1
-cL foo/sym -> ../bar/baz/rsync
+case `tail -1 "$outfile"` in
+cLc.t*)
+ sym_dots="c.t.$dots"
+ L_sym_dots="cL$sym_dots"
+ is_uptodate='-> ../bar/baz/rsync'
+ echo "cL$sym_dots foo/sym $is_uptodate" >"$chkfile.extra"
+ L=cL
+ ;;
+*)
+ sym_dots="$allspace"
+ L_sym_dots=".L$allspace"
+ is_uptodate='is uptodate'
+ touch "$chkfile.extra"
+ ;;
+esac
+cat <<EOT >"$chkfile"
+cd$allspace ./
+cd$allspace bar/
+cd$allspace bar/baz/
+cf$allspace bar/baz/rsync
+cd$allspace foo/
+cf$allspace foo/config1
+cf$allspace foo/config2
+hf$allspace foo/extra => foo/config1
+cL$sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-hf foo/extra => foo/config1
+cat - "$chkfile.extra" <<EOT >"$chkfile"
+hf$allspace foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
$RSYNC -vvplrtH --copy-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
foo/ is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
+foo/sym $is_uptodate
foo/extra => foo/config1
-foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"
$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-cd ./
-cd bar/
-cd bar/baz/
-hf bar/baz/rsync
-cd foo/
-hf foo/config1
-hf foo/config2
-hf foo/extra => foo/config1
-$L foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$chkfile"
+cd$allspace ./
+cd$allspace bar/
+cd$allspace bar/baz/
+hf$allspace bar/baz/rsync
+cd$allspace foo/
+hf$allspace foo/config1
+hf$allspace foo/config2
+hf$allspace foo/extra => foo/config1
+$L$sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
$RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
foo/extra is uptodate
-foo/sym is uptodate
+foo/sym $is_uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-cd ./
-cd bar/
-cd bar/baz/
-.f bar/baz/rsync
-cd foo/
-.f foo/config1
-.f foo/config2
-.f foo/extra
-.L foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$chkfile"
+cd$allspace ./
+cd$allspace bar/
+cd$allspace bar/baz/
+.f$allspace bar/baz/rsync
+cd$allspace foo/
+.f$allspace foo/config1
+.f$allspace foo/config2
+.f$allspace foo/extra
+$L_sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
$RSYNC -vvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
foo/extra is uptodate
-foo/sym is uptodate
+foo/sym $is_uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 17 failed"