[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Mon Sep 6 10:57:24 MDT 2010


The branch, master has been updated
       via  d64bda1 Some quoting fixes/improvements.
       via  c6679e0 If we create an off_t type, define SIZEOF_OFF_T.
       via  9cb20c6 Fix rsync_xal_set reference in an error.
      from  ba342e2 Undo unintended mode-reference tweak.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d64bda1c1e79dc385f194d74f7957ce7cd118654
Author: Wayne Davison <wayned at samba.org>
Date:   Mon Sep 6 08:41:46 2010 -0700

    Some quoting fixes/improvements.

commit c6679e04f8bfacc27a88be9927db5e79bbefc78b
Author: Wayne Davison <wayned at samba.org>
Date:   Mon Sep 6 08:25:19 2010 -0700

    If we create an off_t type, define SIZEOF_OFF_T.

commit 9cb20c605f2c4c9a0928496529ce318643536e1a
Author: Wayne Davison <wayned at samba.org>
Date:   Mon Sep 6 08:09:20 2010 -0700

    Fix rsync_xal_set reference in an error.

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

Summary of changes:
 rsync.h     |    2 ++
 support/lsh |    6 +++---
 xattrs.c    |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/rsync.h b/rsync.h
index 4a5313e..3404da7 100644
--- a/rsync.h
+++ b/rsync.h
@@ -465,6 +465,8 @@ typedef unsigned int mode_t;
 #endif
 #ifndef HAVE_OFF_T
 typedef long off_t;
+#undef SIZEOF_OFF_T
+#define SIZEOF_OFF_T SIZEOF_LONG
 #endif
 #ifndef HAVE_SIZE_T
 typedef unsigned int size_t;
diff --git a/support/lsh b/support/lsh
index 2017126..65488dc 100755
--- a/support/lsh
+++ b/support/lsh
@@ -13,7 +13,7 @@ do_cd=y # Default path is user's home dir, just like ssh.
 while : ; do
     case "$1" in
     -l) user="$2"; shift; shift ;;
-    -l*) user=`echo $1 | sed 's/^-l//'`; shift ;;
+    -l*) user=`echo "$1" | sed 's/^-l//'`; shift ;;
     --no-cd) do_cd=n; shift ;;
     -*) shift ;;
     localhost) shift; break ;;
@@ -22,9 +22,9 @@ while : ; do
 done
 
 if [ "$user" ]; then
-    prefix="sudo -H -u $user"
+    prefix="sudo -H -u '$user'"
     if [ $do_cd = y ]; then
-	home=`perl -e "print((getpwnam("$user"))[7])"`
+	home=`perl -e "print((getpwnam('$user'))[7])"`
 	# Yeah, this may fail, but attempts to get sudo to cd are harder.
 	cd $home
     fi
diff --git a/xattrs.c b/xattrs.c
index e6a7156..fcefebb 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -872,7 +872,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 		if (i == xalp->count) {
 			if (sys_lremovexattr(fname, name) < 0) {
 				rsyserr(FERROR_XFER, errno,
-					"rsync_xal_clear: lremovexattr(\"%s\",\"%s\") failed",
+					"rsync_xal_set: lremovexattr(\"%s\",\"%s\") failed",
 					fname, name);
 				ret = -1;
 			} else /* make sure caller sets mtime */


-- 
The rsync repository.


More information about the rsync-cvs mailing list