X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7352b8736b94a7cb375cc2789fba6728d5c35955..65fc84b32e2a558cca3a66587ac4cd06e16f1471:/rsync.c

diff --git a/rsync.c b/rsync.c
index ad9293c4..3c1115f7 100644
--- a/rsync.c
+++ b/rsync.c
@@ -93,7 +93,7 @@ int delete_file(char *fname)
 		if (strcmp(dname,".") == 0
 		    || strcmp(dname,"..") == 0)
 			continue;
-		snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+		pathjoin(buf, sizeof buf, fname, dname);
 		if (verbose > 0)
 			rprintf(FINFO,"deleting %s\n", buf);
 		if (delete_file(buf) != 0) {
@@ -152,7 +152,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	}
 
 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-	change_gid = preserve_gid && file->gid != (gid_t)-1
+	change_gid = preserve_gid && file->gid != GID_NONE
 		&& st->st_gid != file->gid;
 	if (change_uid || change_gid) {
 		if (do_lchown(fname,
@@ -160,7 +160,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 			      change_gid?file->gid:st->st_gid) != 0) {
 			/* shouldn't have attempted to change uid or gid
 			     unless have the privilege */
-			rprintf(FERROR, "chown %s failed: %s\n",
+			rprintf(FERROR, "%s %s failed: %s\n",
+				change_uid ? "chown" : "chgrp",
 				full_fname(fname), strerror(errno));
 			return 0;
 		}