[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  4403b13 Fix --force with --one-file-system w/o --delete.
       via  c82711b Fix issue with devices-fake test.
      from  b2e446d Fix devices test on OS w/o hard-linked devices.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4403b1332f3264e357a46c1c96853a809dcfcaf8
Author: Wayne Davison <wayned at samba.org>
Date:   Tue Feb 22 08:19:50 2011 -0800

    Fix --force with --one-file-system w/o --delete.

commit c82711b34e7d24f4d386c61b9e45ac2163a58936
Author: Wayne Davison <wayned at samba.org>
Date:   Tue Feb 22 07:59:08 2011 -0800

    Fix issue with devices-fake test.

-----------------------------------------------------------------------

Summary of changes:
 main.c                 |    2 ++
 testsuite/devices.test |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/main.c b/main.c
index 649aa90..de5bc48 100644
--- a/main.c
+++ b/main.c
@@ -70,6 +70,7 @@ extern int sock_f_out;
 extern int filesfrom_fd;
 extern int connect_timeout;
 extern int send_msgs_to_gen;
+extern dev_t filesystem_dev;
 extern pid_t cleanup_child_pid;
 extern size_t bwlimit_writemax;
 extern unsigned int module_dirlen;
@@ -610,6 +611,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 					full_fname(dest_path));
 				exit_cleanup(RERR_FILESELECT);
 			}
+			filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
 			return NULL;
 		}
 		if (file_total > 1) {
diff --git a/testsuite/devices.test b/testsuite/devices.test
index d9db846..bb3ab93 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -116,7 +116,7 @@ cD$all_plus char2
 cD$all_plus char3
 cS$all_plus fifo
 EOT
-if test ! -b "$fromdir/block3.5"; then
+if test ! -r "$fromdir/block3.5"; then
     grep -v block3.5 <"$chkfile" >"$chkfile.new"
     mv "$chkfile.new" "$chkfile"
 fi
@@ -128,7 +128,7 @@ echo ""
 ( cd "$todir" && rsync_ls_lR . ) > "$tmpdir/ls-to"
 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to"
 
-if test -b "$fromdir/block3.5"; then
+if test -r "$fromdir/block3.5"; then
     set -x
     $RSYNC -aii --link-dest="$todir" "$fromdir/" "$chkdir/" \
 	| tee "$outfile"


-- 
The rsync repository.