Mention the EEXIST fix.
[rsync.git] / rsync.c
diff --git a/rsync.c b/rsync.c
index 6b5b500f0c2f99db4d4b4d8c33ffbce751cda7c3..ca21e5e44bea1b4708c51fcf82e466b4a2bbc7f4 100644 (file)
--- a/rsync.c
+++ b/rsync.c
 
 extern int verbose;
 extern int dry_run;
+extern int daemon_log_format_has_i;
 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 am_starting_up;
 extern int preserve_uid;
 extern int preserve_gid;
-extern int force_delete;
-extern int recurse;
+extern int inplace;
 extern int keep_dirlinks;
 extern int make_backups;
-extern char *backup_dir;
-extern int inplace;
+extern struct stats stats;
 
 
 /*
@@ -48,101 +50,6 @@ 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)
-{
-       DIR *d;
-       struct dirent *di;
-       char buf[MAXPATHLEN];
-       STRUCT_STAT st;
-
-       if (!(flags & DEL_DIR)) {
-               if (robust_unlink(fname) == 0) {
-                       if (verbose && !(flags & DEL_TERSE)) {
-                               rprintf(FINFO, "deleting %s\n",
-                                       safe_fname(fname));
-                       }
-                       return 0;
-               }
-               if (errno == ENOENT)
-                       return 0;
-               rsyserr(FERROR, errno, "delete_file: unlink %s failed",
-                       full_fname(fname));
-               return -1;
-       }
-
-       if (do_rmdir(fname) == 0) {
-               if (verbose && !(flags & DEL_TERSE)) {
-                       rprintf(FINFO, "deleting %s/\n",
-                               safe_fname(fname));
-               }
-               return 0;
-       }
-       if (errno == ENOENT)
-               return 0;
-       if ((flags & DEL_NO_RECURSE) || !force_delete || !recurse
-           || (errno != ENOTEMPTY && errno != EEXIST)) {
-               rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
-                       full_fname(fname));
-               return -1;
-       }
-
-       /* now we do a recsursive delete on the directory ... */
-       if (!(d = opendir(fname))) {
-               rsyserr(FERROR, errno, "delete_file: opendir %s failed",
-                       full_fname(fname));
-               return -1;
-       }
-
-       if (!(flags & DEL_TERSE)) {
-               if (verbose)
-                       rprintf(FINFO, "deleting %s/\n", safe_fname(fname));
-               flags |= DEL_TERSE;
-       }
-
-       for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
-               char *dname = d_name(di);
-               if (dname[0] == '.' && (dname[1] == '\0'
-                   || (dname[1] == '.' && dname[2] == '\0')))
-                       continue;
-               pathjoin(buf, sizeof buf, fname, dname);
-
-               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) {
-                       closedir(d);
-                       return -1;
-               }
-       }
-       if (errno) {
-               rsyserr(FERROR, errno, "delete_file: readdir %s failed",
-                       full_fname(fname));
-               closedir(d);
-               return -1;
-       }
-
-       closedir(d);
-
-       if (do_rmdir(fname) != 0 && errno != ENOENT) {
-               rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
-                       full_fname(fname));
-               return -1;
-       }
-
-       return 0;
-}
-
 int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
              int flags)
 {
@@ -150,10 +57,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        STRUCT_STAT st2;
        int change_uid, change_gid;
 
-       if (dry_run)
-               return 0;
-
        if (!st) {
+               if (dry_run)
+                       return 1;
                if (link_stat(fname, &st2, 0) < 0) {
                        rsyserr(FERROR, errno, "stat %s failed",
                                full_fname(fname));
@@ -163,14 +69,11 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        }
 
        if (!preserve_times || S_ISLNK(st->st_mode)
-           || (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
+        || (S_ISDIR(st->st_mode) && omit_dir_times))
                flags |= PERMS_SKIP_MTIME;
        if (!(flags & PERMS_SKIP_MTIME)
            && cmp_modtime(st->st_mtime, file->modtime) != 0) {
-               /* don't complain about not setting times on directories
-                * because some filesystems can't do it */
-               if (set_modtime(fname,file->modtime) != 0 &&
-                   !S_ISDIR(st->st_mode)) {
+               if (set_modtime(fname,file->modtime) != 0) {
                        rsyserr(FERROR, errno, "failed to set times on %s",
                                full_fname(fname));
                        return 0;
@@ -181,7 +84,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
@@ -190,13 +93,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,
@@ -233,10 +138,12 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 #endif
 
        if (verbose > 1 && flags & PERMS_REPORT) {
+               enum logcode code = daemon_log_format_has_i || dry_run
+                                 ? FCLIENT : FINFO;
                if (updated)
-                       rprintf(FINFO,"%s\n",fname);
+                       rprintf(code, "%s\n", safe_fname(fname));
                else
-                       rprintf(FINFO,"%s is uptodate\n",fname);
+                       rprintf(code, "%s is uptodate\n", safe_fname(fname));
        }
        return updated;
 }
@@ -266,7 +173,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;
        }
 
@@ -277,13 +184,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;
        }
@@ -297,5 +206,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 const char *who_am_i(void)
 {
+       if (am_starting_up)
+               return am_server ? "server" : "client";
        return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 }