Removed am_client variable. It was being set in one place, when a client

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 230d11f..3f79f50 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -94,7 +94,7 @@ int delete_file(char *fname)
                if (strcmp(dname,".")==0 ||
                    strcmp(dname,"..")==0)
                        continue;
-               slprintf(buf, sizeof(buf)-1, "%s/%s", fname, dname);
+               slprintf(buf, sizeof(buf), "%s/%s", fname, dname);
                if (verbose > 0)
                        rprintf(FINFO,"deleting %s\n", buf);
                if (delete_file(buf) != 0) {
@@ -149,8 +149,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
            ((am_root && preserve_uid && st->st_uid != file->uid) || 
             (preserve_gid && st->st_gid != file->gid))) {
                if (do_lchown(fname,
-                             (am_root&&preserve_uid)?file->uid:-1,
-                             preserve_gid?file->gid:-1) != 0) {
+                             (am_root&&preserve_uid)?file->uid:st->st_uid,
+                             preserve_gid?file->gid:st->st_gid) != 0) {
                        if (preserve_uid && st->st_uid != file->uid)
                                updated = 1;
                        if (verbose>1 || preserve_uid) {
@@ -188,7 +188,27 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
 void sig_int(void)
 {
-       exit_cleanup(1);
+       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;
 }
 
 
@@ -196,18 +216,8 @@ void sig_int(void)
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 {
-       if (make_backups) {
-               char fnamebak[MAXPATHLEN];
-               if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
-                       rprintf(FERROR,"backup filename too long\n");
-                       return;
-               }
-               slprintf(fnamebak,sizeof(fnamebak)-1,"%s%s",fname,backup_suffix);
-               if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
-                       rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
-                       return;
-               }
-       }
+       if (make_backups && !make_backup(fname))
+               return;
 
        /* move tmp file over real file */
        if (do_rename(fnametmp,fname) != 0) {