Fixed failing hunks.

diff --git a/atimes.diff b/atimes.diff
index 18803a8..e69e246 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -5,7 +5,7 @@ command before "make":
 
 
 --- batch.c    15 May 2004 19:31:10 -0000      1.32
-+++ batch.c    15 May 2004 20:13:11 -0000
++++ batch.c    18 May 2004 09:26:41 -0000
 @@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",
@@ -15,8 +15,8 @@ command before "make":
                rprintf(FINFO, "flist->length=%.0f\n",
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- flist.c    15 May 2004 19:31:10 -0000      1.223
-+++ flist.c    15 May 2004 20:13:11 -0000
+--- flist.c    16 May 2004 23:54:12 -0000      1.224
++++ flist.c    18 May 2004 09:26:42 -0000
 @@ -57,6 +57,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
@@ -127,9 +127,9 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
---- generator.c        15 May 2004 19:31:10 -0000      1.83
-+++ generator.c        15 May 2004 20:13:11 -0000
-@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
+--- generator.c        18 May 2004 08:50:17 -0000      1.85
++++ generator.c        18 May 2004 09:26:42 -0000
+@@ -100,7 +100,7 @@ static int skip_file(char *fname, struct
                return 0;
        }
  
@@ -138,7 +138,7 @@ command before "make":
  }
  
  
-@@ -467,7 +467,7 @@ void recv_generator(char *fname, struct 
+@@ -480,7 +480,7 @@ void recv_generator(char *fname, struct 
                return;
        }
  
@@ -148,7 +148,7 @@ command before "make":
                        rprintf(FINFO,"%s is newer\n",fname);
                return;
 --- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  15 May 2004 20:13:11 -0000
++++ options.c  18 May 2004 09:26:42 -0000
 @@ -46,6 +46,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
@@ -183,7 +183,7 @@ command before "make":
                argstr[x++] = 'p';
        if (recurse)
 --- rsync.c    15 May 2004 19:31:10 -0000      1.139
-+++ rsync.c    15 May 2004 20:13:12 -0000
++++ rsync.c    18 May 2004 09:26:42 -0000
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -228,8 +228,8 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- rsync.h    13 May 2004 18:51:22 -0000      1.203
-+++ rsync.h    15 May 2004 20:13:12 -0000
+--- rsync.h    16 May 2004 07:28:24 -0000      1.204
++++ rsync.h    18 May 2004 09:26:43 -0000
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)
@@ -255,7 +255,7 @@ command before "make":
        gid_t gid;
        mode_t mode;
 --- rsync.yo   7 May 2004 00:18:37 -0000       1.169
-+++ rsync.yo   15 May 2004 20:13:12 -0000
++++ rsync.yo   18 May 2004 09:26:43 -0000
 @@ -299,6 +299,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
@@ -277,7 +277,7 @@ command before "make":
  dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
  instead it will just report the actions it would have taken.
 --- tls.c      15 May 2004 19:09:42 -0000      1.20
-+++ tls.c      15 May 2004 20:13:13 -0000
++++ tls.c      18 May 2004 09:26:44 -0000
 @@ -39,6 +39,7 @@
  
  
@@ -414,7 +414,7 @@ command before "make":
        return 0;
  }
 --- util.c     15 May 2004 19:31:10 -0000      1.143
-+++ util.c     15 May 2004 20:13:13 -0000
++++ util.c     18 May 2004 09:26:44 -0000
 @@ -124,32 +124,40 @@ void overflow(char *str)
  
  
@@ -483,19 +483,16 @@ command before "make":
        extern int modify_window;
  
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ testsuite/copy-atimes.test 15 May 2004 20:13:13 -0000
-@@ -0,0 +1,22 @@
++++ testsuite/copy-atimes.test 18 May 2004 09:26:44 -0000
+@@ -0,0 +1,19 @@
 +#! /bin/sh
 +
 +# Test rsync copying atimes
 +
-+. $srcdir/testsuite/rsync.fns
++. "$suitedir/rsync.fns"
 +
 +set -x
 +
-+fromdir="$scratchdir/from"
-+todir="$scratchdir/to"
-+
 +mkdir "$fromdir"
 +
 +touch "$fromdir/foo"
@@ -507,9 +504,9 @@ command before "make":
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
---- testsuite/rsync.fns        4 Feb 2004 07:32:48 -0000       1.59
-+++ testsuite/rsync.fns        15 May 2004 20:13:13 -0000
-@@ -51,7 +51,7 @@ printmsg() {
+--- testsuite/rsync.fns        18 May 2004 00:41:55 -0000      1.60
++++ testsuite/rsync.fns        18 May 2004 09:26:44 -0000
+@@ -50,7 +50,7 @@ printmsg() {
  
  
  rsync_ls_lR() {
@@ -518,38 +515,38 @@ command before "make":
  }
  
  rsync_getgroups() { 
-@@ -151,6 +151,8 @@ checkit() {
+@@ -150,6 +150,8 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
-+    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
++    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
 +
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -159,6 +161,12 @@ checkit() {
+@@ -158,6 +160,12 @@ checkit() {
      fi
  
      echo "-------------"
 +    echo "check how the directory listings compare with diff:"
 +    echo ""
-+    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
-+    diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
++    ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
++    diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
 +
 +    echo "-------------"
      echo "check how the files compare with diff:"
      echo ""
      for f in `cd "$2"; find . -type f -print `
-@@ -166,12 +174,6 @@ checkit() {
+@@ -165,12 +173,6 @@ checkit() {
          diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
      done
  
 -    echo "-------------"
 -    echo "check how the directory listings compare with diff:"
 -    echo ""
--    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
--    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
--    diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
-     if [ -z "${failed}" ] ; then
+-    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
+-    ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
+-    diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
+     if [ -z "$failed" ] ; then
        return 0
      else

diff --git a/date-only.diff b/date-only.diff
index e6c531d..6e0c55f 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,15 +15,17 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- generator.c        5 May 2004 17:15:03 -0000       1.81
-+++ generator.c        8 May 2004 18:36:12 -0000
-@@ -51,11 +51,14 @@ extern int list_only;
+--- generator.c        18 May 2004 08:50:17 -0000      1.85
++++ generator.c        18 May 2004 09:31:22 -0000
+@@ -51,6 +51,7 @@ extern int list_only;
  extern int only_existing;
  extern int orig_umask;
  extern int safe_symlinks;
 +extern int date_only;
  
+ extern struct exclude_list_struct server_exclude_list;
  
+@@ -58,6 +59,8 @@ extern struct exclude_list_struct server
  /* choose whether to skip a particular file */
  static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -33,7 +35,7 @@ Jeremy Bornstein
                return 0;
        }
 --- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  8 May 2004 18:36:13 -0000
++++ options.c  18 May 2004 09:31:23 -0000
 @@ -82,6 +82,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
@@ -69,7 +71,7 @@ Jeremy Bornstein
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
 --- rsync.yo   7 May 2004 00:18:37 -0000       1.169
-+++ rsync.yo   8 May 2004 18:36:13 -0000
++++ rsync.yo   18 May 2004 09:31:23 -0000
 @@ -320,6 +320,7 @@ verb(
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          turn off mod time & file size quick check

diff --git a/dir-times.diff b/dir-times.diff
index ce9c48a..68ca5d6 100644 (file)
--- a/dir-times.diff
+++ b/dir-times.diff
@@ -1,5 +1,5 @@
 --- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  13 May 2004 18:59:46 -0000
++++ options.c  18 May 2004 09:48:58 -0000
 @@ -46,6 +46,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
@@ -35,8 +35,8 @@
        if (preserve_perms)
                argstr[x++] = 'p';
        if (recurse)
---- rsync.c    13 May 2004 18:51:22 -0000      1.138
-+++ rsync.c    13 May 2004 18:59:47 -0000
+--- rsync.c    15 May 2004 19:31:10 -0000      1.139
++++ rsync.c    18 May 2004 09:48:58 -0000
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -69,7 +69,7 @@
                                full_fname(fname));
                        return 0;
 --- rsync.yo   7 May 2004 00:18:37 -0000       1.169
-+++ rsync.yo   13 May 2004 18:59:47 -0000
++++ rsync.yo   18 May 2004 09:48:58 -0000
 @@ -298,7 +298,8 @@ verb(
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
@@ -105,9 +105,9 @@
  
  dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
  instead it will just report the actions it would have taken.
---- testsuite/chgrp.test       5 Feb 2004 01:37:08 -0000       1.10
-+++ testsuite/chgrp.test       13 May 2004 18:59:47 -0000
-@@ -29,7 +29,7 @@ do
+--- testsuite/chgrp.test       18 May 2004 00:41:35 -0000      1.11
++++ testsuite/chgrp.test       18 May 2004 09:48:58 -0000
+@@ -26,7 +26,7 @@ do
  done
  sleep 2
  
@@ -116,9 +116,9 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/chown.test       4 Feb 2004 18:24:41 -0000       1.4
-+++ testsuite/chown.test       13 May 2004 18:59:47 -0000
-@@ -31,7 +31,7 @@ chown 5001 "$name2" || test_skipped "Can
+--- testsuite/chown.test       18 May 2004 00:41:35 -0000      1.5
++++ testsuite/chown.test       18 May 2004 09:48:58 -0000
+@@ -28,7 +28,7 @@ chown 5001 "$name2" || test_skipped "Can
  chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)"
  chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)"
  
@@ -127,31 +127,37 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/daemon-gzip-download.test        4 Feb 2004 18:24:41 -0000       1.6
-+++ testsuite/daemon-gzip-download.test        13 May 2004 18:59:47 -0000
-@@ -27,7 +27,7 @@ RSYNC_CONNECT_PROG="$RSYNC --config=$con
- export RSYNC_CONNECT_PROG
- 
+--- testsuite/daemon-gzip-download.test        18 May 2004 00:41:51 -0000      1.7
++++ testsuite/daemon-gzip-download.test        18 May 2004 09:48:58 -0000
+@@ -29,9 +29,9 @@ export RSYNC_CONNECT_PROG
  hands_setup
--checkit "$RSYNC -avvvvz localhost::test-from/ \"$TO/\"" "$FROM" "$TO"
-+checkit "$RSYNC -advvvvz localhost::test-from/ \"$TO/\"" "$FROM" "$TO"
+ 
+ # Build chkdir with a normal rsync and an --exclude.
+-$RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/"
++$RSYNC -adv --exclude=foobar.baz "$fromdir/" "$chkdir/"
+ 
+-checkit "$RSYNC -avvvvz localhost::test-from/ \"$todir/\"" "$chkdir" "$todir"
++checkit "$RSYNC -advvvvz localhost::test-from/ \"$todir/\"" "$chkdir" "$todir"
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/daemon-gzip-upload.test  4 Feb 2004 18:24:41 -0000       1.6
-+++ testsuite/daemon-gzip-upload.test  13 May 2004 18:59:47 -0000
-@@ -21,7 +21,7 @@ RSYNC_CONNECT_PROG="$RSYNC --config=$con
- export RSYNC_CONNECT_PROG
- 
+--- testsuite/daemon-gzip-upload.test  18 May 2004 00:41:51 -0000      1.7
++++ testsuite/daemon-gzip-upload.test  18 May 2004 09:48:58 -0000
+@@ -23,9 +23,9 @@ export RSYNC_CONNECT_PROG
  hands_setup
--checkit "$RSYNC -avvvvz \"$FROM/\" localhost::test-to/" "$FROM" "$TO"
-+checkit "$RSYNC -advvvvz \"$FROM/\" localhost::test-to/" "$FROM" "$TO"
+ 
+ # Build chkdir with a normal rsync and an --exclude.
+-$RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/"
++$RSYNC -adv --exclude=foobar.baz "$fromdir/" "$chkdir/"
+ 
+-checkit "$RSYNC -avvvvz \"$fromdir/\" localhost::test-to/" "$chkdir" "$todir"
++checkit "$RSYNC -advvvvz \"$fromdir/\" localhost::test-to/" "$chkdir" "$todir"
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/devices.test     9 Apr 2004 00:36:45 -0000       1.7
-+++ testsuite/devices.test     13 May 2004 18:59:47 -0000
-@@ -32,7 +32,7 @@ mknod "$fromdir/block" b 42 69 || test_s
+--- testsuite/devices.test     18 May 2004 00:41:35 -0000      1.8
++++ testsuite/devices.test     18 May 2004 09:48:58 -0000
+@@ -29,7 +29,7 @@ mknod "$fromdir/block" b 42 69 || test_s
  mknod "$fromdir/block2" b 42 73 || test_skipped "Can't create block device node unless root"
  mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
  
@@ -160,9 +166,9 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/duplicates.test  4 Feb 2004 18:24:41 -0000       1.9
-+++ testsuite/duplicates.test  13 May 2004 18:59:47 -0000
-@@ -36,7 +36,7 @@ ln -s "$name1" "$name2" || fail "can't c
+--- testsuite/duplicates.test  18 May 2004 00:41:35 -0000      1.10
++++ testsuite/duplicates.test  18 May 2004 09:48:59 -0000
+@@ -33,7 +33,7 @@ ln -s "$name1" "$name2" || fail "can't c
  
  outfile="$scratchdir/rsync.out"
  
@@ -171,9 +177,9 @@
      | tee "$outfile"
  
  # Make sure each file was only copied once...
---- testsuite/exclude.test     14 Apr 2004 20:50:32 -0000      1.5
-+++ testsuite/exclude.test     13 May 2004 18:59:47 -0000
-@@ -67,7 +67,7 @@ EOF
+--- testsuite/exclude.test     18 May 2004 00:41:38 -0000      1.6
++++ testsuite/exclude.test     18 May 2004 09:48:59 -0000
+@@ -63,7 +63,7 @@ EOF
  
  # Create the chk dir with what we expect to be excluded
  
@@ -182,7 +188,7 @@
  
  sleep 1 # Ensures that the rm commands will tweak the directory times.
  
-@@ -79,11 +79,11 @@ rm "$chkdir"/mid/for/foo/extra
+@@ -75,11 +75,11 @@ rm "$chkdir"/mid/for/foo/extra
  
  # Un-tweak the directory times in our first (weak) exclude test (though
  # it's a good test of the --existing option).
@@ -196,7 +202,7 @@
  
  # Modify the chk dir by removing cvs-ignored files and then tweaking the dir times.
  
-@@ -93,12 +93,12 @@ rm "$chkdir"/bar/down/to/foo/*.junk
+@@ -89,12 +89,12 @@ rm "$chkdir"/bar/down/to/foo/*.junk
  rm "$chkdir"/bar/down/to/home-cvs-exclude
  rm "$chkdir"/mid/one-in-one-out
  
@@ -211,35 +217,35 @@
      \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
  
  # The script would have aborted on error, so getting here means we've won.
---- testsuite/hands.test       4 Feb 2004 18:24:41 -0000       1.12
-+++ testsuite/hands.test       13 May 2004 18:59:47 -0000
+--- testsuite/hands.test       18 May 2004 00:41:46 -0000      1.13
++++ testsuite/hands.test       18 May 2004 09:48:59 -0000
 @@ -11,19 +11,19 @@ hands_setup
  
  # Main script starts here
  
--runtest "basic operation" 'checkit "$RSYNC -av ${FROM}/ ${TO}" ${FROM}/ ${TO}'
-+runtest "basic operation" 'checkit "$RSYNC -adv ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+-runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
++runtest "basic operation" 'checkit "$RSYNC -adv \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
  
- ln ${FROM}/filelist ${FROM}/dir
--runtest "hard links" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
-+runtest "hard links" 'checkit "$RSYNC -advH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+ ln "$fromdir/filelist" "$fromdir/dir"
+-runtest "hard links" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
++runtest "hard links" 'checkit "$RSYNC -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
  
- rm ${TO}/text
--runtest "one file" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
-+runtest "one file" 'checkit "$RSYNC -advH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+ rm "$todir/text"
+-runtest "one file" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
++runtest "one file" 'checkit "$RSYNC -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
  
- echo "extra line" >> ${TO}/text
--runtest "extra data" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
-+runtest "extra data" 'checkit "$RSYNC -advH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+ echo "extra line" >> "$todir/text"
+-runtest "extra data" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
++runtest "extra data" 'checkit "$RSYNC -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
  
- cp ${FROM}/text ${TO}/ThisShouldGo
--runtest " --delete" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
-+runtest " --delete" 'checkit "$RSYNC --delete -advH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+ cp "$fromdir/text" "$todir/ThisShouldGo"
+-runtest " --delete" 'checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
++runtest " --delete" 'checkit "$RSYNC --delete -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/hardlinks.test   4 Feb 2004 18:24:41 -0000       1.4
-+++ testsuite/hardlinks.test   13 May 2004 18:59:47 -0000
+--- testsuite/hardlinks.test   18 May 2004 00:41:40 -0000      1.5
++++ testsuite/hardlinks.test   18 May 2004 09:48:59 -0000
 @@ -31,7 +31,7 @@ ln "$name1" "$name2" || fail "Can't crea
  ln "$name2" "$name3" || fail "Can't create hardlink"
  cp "$name2" "$name4" || fail "Can't copy file"
@@ -249,20 +255,20 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/longdir.test     4 Feb 2004 18:24:41 -0000       1.9
-+++ testsuite/longdir.test     13 May 2004 18:59:47 -0000
-@@ -18,7 +18,7 @@ makepath $LONGDIR || test_skipped "unabl
- touch $LONGDIR/1 || test_skipped "unable to create files in long directory"
- date > ${LONGDIR}/1
- ls -la / > ${LONGDIR}/2
--checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}
-+checkit "$RSYNC --delete -advH ${FROM}/ ${TO}" ${FROM}/ ${TO}
+--- testsuite/longdir.test     18 May 2004 09:47:42 -0000      1.11
++++ testsuite/longdir.test     18 May 2004 09:48:59 -0000
+@@ -18,7 +18,7 @@ makepath "$longdir" || test_skipped "una
+ touch "$longdir/1" || test_skipped "unable to create files in long directory"
+ date > "$longdir/1"
+ ls -la / > "$longdir/2"
+-checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"
++checkit "$RSYNC --delete -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/merge.test       30 Apr 2004 17:24:49 -0000      1.5
-+++ testsuite/merge.test       13 May 2004 18:59:47 -0000
-@@ -43,9 +43,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/s
+--- testsuite/merge.test       18 May 2004 00:41:38 -0000      1.6
++++ testsuite/merge.test       18 May 2004 09:48:59 -0000
+@@ -40,9 +40,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/s
  cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
  
  # Get rid of any directory-time differences
@@ -274,25 +280,25 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- testsuite/ssh-basic.test   19 Feb 2003 16:22:50 -0000      1.6
-+++ testsuite/ssh-basic.test   13 May 2004 18:59:47 -0000
+--- testsuite/ssh-basic.test   18 May 2004 00:41:46 -0000      1.7
++++ testsuite/ssh-basic.test   18 May 2004 09:48:59 -0000
 @@ -28,7 +28,7 @@ fi
  # nothing to do.
  hands_setup
  
--runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
-+runtest "ssh: basic test" 'checkit "$RSYNC -advH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
+-runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
++runtest "ssh: basic test" 'checkit "$RSYNC -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
  
  # Added by Steve Bonds Feb 2 2003
  # I assumed that "F1" was intended to hold a single file for testing if
-@@ -40,4 +40,4 @@ F1=`ls ${TO} | head -5 | tail -1`
+@@ -40,4 +40,4 @@ F1=`ls "$todir" | head -5 | tail -1`
  
- mv ${TO}/${F1} ${TO}/ThisShouldGo
+ mv "$todir/$F1" "$todir/ThisShouldGo"
  
--runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
-+runtest "ssh: renamed file" 'checkit "$RSYNC --delete -advH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
---- testsuite/unsafe-links.test        15 Jan 2003 16:14:07 -0000      1.6
-+++ testsuite/unsafe-links.test        13 May 2004 18:59:47 -0000
+-runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
++runtest "ssh: renamed file" 'checkit "$RSYNC --delete -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
+--- testsuite/unsafe-links.test        18 May 2004 00:41:43 -0000      1.7
++++ testsuite/unsafe-links.test        18 May 2004 09:48:59 -0000
 @@ -35,33 +35,33 @@ ln -s ../../unsafe/unsafefile "from/safe
  set -x