- Changed the calling args to delete_file() to take an st_mode instead

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 576ce63..4c34deb 100644 (file)
--- 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)
@@ -76,14 +78,13 @@ int delete_file(char *fname, int flags)
                return -1;
        }
 
-       zap_dir = flags & DEL_RECURSE || (force_delete && recurse);
+       zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
+               && !(flags & DEL_NO_RECURSE);
        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)
@@ -102,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;
        }
 
@@ -116,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;
                }
@@ -182,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
@@ -191,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,
@@ -235,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;
 }
@@ -267,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;
        }
 
@@ -278,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;
        }
@@ -298,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";
 }