added --backup-dir option from Bob Edwards

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 87a8056..039e1cd 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -30,7 +30,6 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_perms;
 extern int make_backups;
-extern char *backup_suffix;
 
 
 /*
@@ -57,7 +56,7 @@ int delete_file(char *fname)
        int ret;
        extern int recurse;
 
-       if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
+       if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
 
 #if SUPPORT_LINKS
        ret = do_lstat(fname, &st);
@@ -153,7 +152,6 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
-       extern int am_daemon;
 
        if (dry_run) return 0;
 
@@ -180,7 +178,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 = !am_daemon && preserve_gid && file->gid != (gid_t) -1 && \
+       change_gid = preserve_gid && file->gid != (gid_t) -1 && \
                                st->st_gid != file->gid;
        if (change_gid && !am_root) {
                /* enforce bsd-style group semantics: non-root can only
@@ -196,19 +194,20 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                        rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
                        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 */
+               if (st->st_mode & (S_ISUID | S_ISGID)) {
+                       link_stat(fname, st);
+               }
                updated = 1;
        }
 
 #ifdef HAVE_CHMOD
        if (!S_ISLNK(st->st_mode)) {
-               int file_mode;
-               if (preserve_perms)
-                       file_mode = file->mode;
-               else
-                       file_mode = file->mode & ACCESSPERMS;
                if (st->st_mode != file->mode) {
                        updated = 1;
-                       if (do_chmod(fname,file_mode) != 0) {
+                       if (do_chmod(fname,file->mode) != 0) {
                                rprintf(FERROR,"failed to set permissions on %s : %s\n",
                                        fname,strerror(errno));
                                return 0;
@@ -232,26 +231,6 @@ void sig_int(void)
        exit_cleanup(RERR_SIGNAL);
 }
 
-int make_backup(char *fname)
-{
-       char fnamebak[MAXPATHLEN];
-       if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
-               rprintf(FERROR,"backup filename too long\n");
-               return 0;
-       }
-
-       slprintf(fnamebak,sizeof(fnamebak),"%s%s",fname,backup_suffix);
-       if (do_rename(fname,fnamebak) != 0) {
-               if (errno != ENOENT) {
-                       rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
-                       return 0;
-               }
-       } else if (verbose > 1) {
-               rprintf(FINFO,"backed up %s to %s\n",fname,fnamebak);
-       }
-       return 1;
-}
-
 
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
@@ -261,7 +240,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
                return;
 
        /* move tmp file over real file */
-       if (do_rename(fnametmp,fname) != 0) {
+       if (robust_rename(fnametmp,fname) != 0) {
                if (errno == EXDEV) {
                        /* rename failed on cross-filesystem link.  
                           Copy the file instead. */
@@ -271,16 +250,12 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
                        } else {
                                set_perms(fname,file,NULL,0);
                        }
-                       do_unlink(fnametmp);
                } else {
                        rprintf(FERROR,"rename %s -> %s : %s\n",
                                fnametmp,fname,strerror(errno));
-                       do_unlink(fnametmp);
                }
+               do_unlink(fnametmp);
        } else {
                set_perms(fname,file,NULL,0);
        }
 }
-
-
-