John E. Malmberg convinced me to standardize on #ifs for defined

[rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 48aa610dcbbdc1a911aa7fe87e7c2440d52ab20a..0245c0b3b9fd3af187fcf1efdb3a19c802eb8c35 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -25,7 +25,9 @@
 extern int verbose;
 extern int dry_run;
 extern int preserve_times;
 extern int verbose;
 extern int dry_run;
 extern int preserve_times;

+extern int omit_dir_times;

 extern int am_root;
 extern int am_root;

+extern int am_server;

 extern int am_sender;
 extern int am_generator;
 extern int preserve_uid;
 extern int am_sender;
 extern int am_generator;
 extern int preserve_uid;


@@ -52,34 +54,43 @@ void free_sums(struct sum_struct *s)
  * delete a file or directory. If force_delete is set then delete
  * recursively
  */
  * delete a file or directory. If force_delete is set then delete
  * recursively
  */

-int delete_file(char *fname)
+int delete_file(char *fname, int flags)

 {
        DIR *d;
        struct dirent *di;
        char buf[MAXPATHLEN];
        STRUCT_STAT st;
 {
        DIR *d;
        struct dirent *di;
        char buf[MAXPATHLEN];
        STRUCT_STAT st;

-       int ret;
-
-#if SUPPORT_LINKS
-       ret = do_lstat(fname, &st);
-#else
-       ret = do_stat(fname, &st);
-#endif
-       if (ret)
-               return -1;
+       int zap_dir;

 
 

-       if (!S_ISDIR(st.st_mode)) {
-               if (robust_unlink(fname) == 0 || errno == ENOENT)
+       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;
        }
 
                        return 0;
                rsyserr(FERROR, errno, "delete_file: unlink %s failed",
                        full_fname(fname));
                return -1;
        }
 

-       if (do_rmdir(fname) == 0 || errno == ENOENT)
+       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));
+               }
+               return 0;
+       }
+       if (errno == ENOENT)

                return 0;
                return 0;

-       if (!force_delete || !recurse
-           || (errno != ENOTEMPTY && errno != EEXIST)) {
+       if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {

                rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
                        full_fname(fname));
                return -1;
                rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
                        full_fname(fname));
                return -1;


@@ -92,15 +103,31 @@ int delete_file(char *fname)
                return -1;
        }
 
                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);
        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 (verbose > 0)
-                       rprintf(FINFO, "deleting %s\n", safe_fname(buf));
-               if (delete_file(buf) != 0) {
+
+               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;
                }
                        closedir(d);
                        return -1;
                }


@@ -114,7 +141,7 @@ int delete_file(char *fname)
 
        closedir(d);
 
 
        closedir(d);
 

-       if (do_rmdir(fname) != 0) {
+       if (do_rmdir(fname) != 0 && errno != ENOENT) {

                rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
                        full_fname(fname));
                return -1;
                rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
                        full_fname(fname));
                return -1;


@@ -130,10 +157,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        STRUCT_STAT st2;
        int change_uid, change_gid;
 
        STRUCT_STAT st2;
        int change_uid, change_gid;
 

-       if (dry_run)
-               return 0;
-

        if (!st) {
        if (!st) {

+               if (dry_run)
+                       return 1;

                if (link_stat(fname, &st2, 0) < 0) {
                        rsyserr(FERROR, errno, "stat %s failed",
                                full_fname(fname));
                if (link_stat(fname, &st2, 0) < 0) {
                        rsyserr(FERROR, errno, "stat %s failed",
                                full_fname(fname));


@@ -143,14 +169,12 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        }
 
        if (!preserve_times || S_ISLNK(st->st_mode)
        }
 
        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 || (make_backups && !backup_dir))))

                flags |= PERMS_SKIP_MTIME;
        if (!(flags & PERMS_SKIP_MTIME)
            && cmp_modtime(st->st_mtime, file->modtime) != 0) {
                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;
                        rsyserr(FERROR, errno, "failed to set times on %s",
                                full_fname(fname));
                        return 0;


@@ -161,17 +185,24 @@ 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;
        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 !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
+       if (S_ISLNK(st->st_mode))
+               ;
+       else
+#endif

        if (change_uid || change_gid) {
                if (verbose > 2) {
                        if (change_uid) {
                                rprintf(FINFO,
        if (change_uid || change_gid) {
                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,
                        }
                        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,
                        }
                }
                if (do_lchown(fname,


@@ -185,8 +216,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                        return 0;
                }
                /* a lchown had been done - we have to re-stat if the
                        return 0;
                }
                /* a lchown had been done - we have to re-stat if the

-                 * destination had the setuid or setgid bits set due
-                 * to the side effect of the chown call */
+                * destination had the setuid or setgid bits set due
+                * to the side effect of the chown call */

                if (st->st_mode & (S_ISUID | S_ISGID)) {
                        link_stat(fname, st,
                                  keep_dirlinks && S_ISDIR(st->st_mode));
                if (st->st_mode & (S_ISUID | S_ISGID)) {
                        link_stat(fname, st,
                                  keep_dirlinks && S_ISDIR(st->st_mode));


@@ -209,9 +240,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
        if (verbose > 1 && flags & PERMS_REPORT) {
                if (updated)
 
        if (verbose > 1 && flags & PERMS_REPORT) {
                if (updated)

-                       rprintf(FINFO,"%s\n",fname);
+                       rprintf(FINFO, "%s\n", safe_fname(fname));

                else
                else

-                       rprintf(FINFO,"%s is uptodate\n",fname);
+                       rprintf(FINFO, "%s is uptodate\n", safe_fname(fname));

        }
        return updated;
 }
        }
        return updated;
 }


@@ -235,35 +266,46 @@ void sig_int(void)
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,

-                    int ok_to_set_time)
+                    int ok_to_set_time, int overwriting_basis)

 {
        int ret;
 
 {
        int ret;
 

-       if (make_backups && !make_backup(fname))
-               return;
-

        if (inplace) {
                if (verbose > 2)
        if (inplace) {
                if (verbose > 2)

-                       rprintf(FINFO, "finishing %s\n", fname);
+                       rprintf(FINFO, "finishing %s\n", safe_fname(fname));

                goto do_set_perms;
        }
 
                goto do_set_perms;
        }
 

+       if (make_backups && overwriting_basis && !make_backup(fname))
+               return;
+
+       /* Change permissions before putting the file into place. */
+       set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
+

        /* move tmp file over real file */
        /* 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",
        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;
        }
                do_unlink(fnametmp);
                return;
        }

+       if (ret == 0) {
+               /* The file was moved into place (not copied), so it's done. */
+               return;
+       }

     do_set_perms:
        set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 }
 
 const char *who_am_i(void)
 {
     do_set_perms:
        set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 }
 
 const char *who_am_i(void)
 {

-    return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+       if (am_sender < 0)
+               return am_server ? "server" : "client";
+       return am_sender ? "sender" : am_generator ? "generator" : "receiver";

 }
 }