X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/25ff04417e4b4fa0aeb44e0b1576a01021aa1650..c786a7aec545259f857212a2376ee4c274d2e3b6:/rsync.c

diff --git a/rsync.c b/rsync.c
index acb260cc..4c34deb4 100644
--- a/rsync.c
+++ b/rsync.c
@@ -24,19 +24,23 @@
 
 extern int verbose;
 extern int dry_run;
+extern int itemize_changes;
 extern int preserve_times;
 extern int omit_dir_times;
 extern int am_root;
+extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int force_delete;
+extern int inplace;
 extern int recurse;
 extern int keep_dirlinks;
 extern int make_backups;
+extern struct stats stats;
 extern char *backup_dir;
-extern int inplace;
+extern char *log_format;
 
 
 /*
@@ -53,7 +57,7 @@ void free_sums(struct sum_struct *s)
  * delete a file or directory. If force_delete is set then delete
  * recursively
  */
-int delete_file(char *fname, int flags)
+int delete_file(char *fname, int mode, int flags)
 {
 	DIR *d;
 	struct dirent *di;
@@ -61,12 +65,10 @@ int delete_file(char *fname, int flags)
 	STRUCT_STAT st;
 	int zap_dir;
 
-	if (!(flags & DEL_DIR)) {
+	if (!S_ISDIR(mode)) {
 		if (robust_unlink(fname) == 0) {
-			if (verbose && !(flags & DEL_TERSE)) {
-				rprintf(FINFO, "deleting %s\n",
-					safe_fname(fname));
-			}
+			if ((verbose || log_format) && !(flags & DEL_TERSE))
+				log_delete(fname, mode);
 			return 0;
 		}
 		if (errno == ENOENT)
@@ -81,10 +83,8 @@ int delete_file(char *fname, int flags)
 	if (dry_run && zap_dir)
 		errno = ENOTEMPTY;
 	else if (do_rmdir(fname) == 0) {
-		if (verbose && !(flags & DEL_TERSE)) {
-			rprintf(FINFO, "deleting %s/\n",
-				safe_fname(fname));
-		}
+		if ((verbose || log_format) && !(flags & DEL_TERSE))
+			log_delete(fname, mode);
 		return 0;
 	}
 	if (errno == ENOENT)
@@ -103,8 +103,8 @@ int delete_file(char *fname, int flags)
 	}
 
 	if (!(flags & DEL_TERSE)) {
-		if (verbose)
-			rprintf(FINFO, "deleting %s/\n", safe_fname(fname));
+		if (verbose || log_format)
+			log_delete(fname, mode);
 		flags |= DEL_TERSE;
 	}
 
@@ -117,15 +117,9 @@ int delete_file(char *fname, int flags)
 
 		if (do_lstat(buf, &st) < 0)
 			continue;
-		if (S_ISDIR(st.st_mode))
-			flags |= DEL_DIR;
-		else
-			flags &= ~DEL_DIR;
-
-		if (verbose)
-			rprintf(FINFO, "deleting %s%s\n", safe_fname(buf),
-				flags & DEL_DIR ? "/" : "");
-		if (delete_file(buf, flags) != 0) {
+		if (verbose || log_format)
+			log_delete(buf, st.st_mode);
+		if (delete_file(buf, st.st_mode, flags) != 0) {
 			closedir(d);
 			return -1;
 		}
@@ -183,7 +177,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_NONE
 		&& st->st_gid != file->gid;
-#if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK
+#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
 	if (S_ISLNK(st->st_mode))
 		;
 	else
@@ -192,13 +186,15 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		if (verbose > 2) {
 			if (change_uid) {
 				rprintf(FINFO,
-				    "set uid of %s from %ld to %ld\n",
-				    fname, (long)st->st_uid, (long)file->uid);
+					"set uid of %s from %ld to %ld\n",
+					safe_fname(fname),
+					(long)st->st_uid, (long)file->uid);
 			}
 			if (change_gid) {
 				rprintf(FINFO,
-				    "set gid of %s from %ld to %ld\n",
-				    fname, (long)st->st_gid, (long)file->gid);
+					"set gid of %s from %ld to %ld\n",
+					safe_fname(fname),
+					(long)st->st_gid, (long)file->gid);
 			}
 		}
 		if (do_lchown(fname,
@@ -221,7 +217,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		updated = 1;
 	}
 
-#if HAVE_CHMOD
+#ifdef HAVE_CHMOD
 	if (!S_ISLNK(st->st_mode)) {
 		if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 			updated = 1;
@@ -236,9 +232,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
 	if (verbose > 1 && flags & PERMS_REPORT) {
 		if (updated)
-			rprintf(FINFO,"%s\n",fname);
+			rprintf(FINFO, "%s\n", safe_fname(fname));
 		else
-			rprintf(FINFO,"%s is uptodate\n",fname);
+			rprintf(FINFO, "%s is uptodate\n", safe_fname(fname));
 	}
 	return updated;
 }
@@ -268,7 +264,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 	if (inplace) {
 		if (verbose > 2)
-			rprintf(FINFO, "finishing %s\n", fname);
+			rprintf(FINFO, "finishing %s\n", safe_fname(fname));
 		goto do_set_perms;
 	}
 
@@ -279,13 +275,15 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 	set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 
 	/* move tmp file over real file */
-	if (verbose > 2)
-		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
+	if (verbose > 2) {
+		rprintf(FINFO, "renaming %s to %s\n",
+			safe_fname(fnametmp), safe_fname(fname));
+	}
 	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 	if (ret < 0) {
 		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
 		    ret == -2 ? "copy" : "rename",
-		    full_fname(fnametmp), fname);
+		    full_fname(fnametmp), safe_fname(fname));
 		do_unlink(fnametmp);
 		return;
 	}
@@ -299,5 +297,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 const char *who_am_i(void)
 {
+	if (am_sender < 0)
+		return am_server ? "server" : "client";
 	return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 }