Configure addition.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 6c8143c..cf310e9 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -26,6 +26,9 @@ extern int verbose;
 extern int dry_run;
 extern int preserve_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 preserve_perms;
@@ -93,7 +96,7 @@ int delete_file(char *fname)
                if (strcmp(dname,".") == 0
                    || strcmp(dname,"..") == 0)
                        continue;
-               snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+               pathjoin(buf, sizeof buf, fname, dname);
                if (verbose > 0)
                        rprintf(FINFO,"deleting %s\n", buf);
                if (delete_file(buf) != 0) {
@@ -119,40 +122,6 @@ int delete_file(char *fname)
        return 0;
 }
 
-static int is_in_group(gid_t gid)
-{
-#ifdef GETGROUPS_T
-       static gid_t last_in = (gid_t) -2, last_out;
-       static int ngroups = -2;
-       static GETGROUPS_T *gidset;
-       int n;
-
-       if (gid == last_in)
-               return last_out;
-       if (ngroups < -1) {
-               /* treat failure (-1) as if not member of any group */
-               ngroups = getgroups(0, 0);
-               if (ngroups > 0) {
-                       gidset = new_array(GETGROUPS_T, ngroups);
-                       ngroups = getgroups(ngroups, gidset);
-               }
-       }
-
-       last_in = gid;
-       last_out = 0;
-       for (n = 0; n < ngroups; n++) {
-               if (gidset[n] == gid) {
-                       last_out = 1;
-                       break;
-               }
-       }
-       return last_out;
-
-#else
-       return 0;
-#endif
-}
-
 int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                int report)
 {
@@ -186,20 +155,28 @@ 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_t) -1 && \
-                               st->st_gid != file->gid;
-       if (change_gid && !am_root) {
-               /* enforce bsd-style group semantics: non-root can only
-                   change to groups that the user is a member of */
-               change_gid = is_in_group(file->gid);
-       }
+       change_gid = preserve_gid && file->gid != GID_NONE
+               && st->st_gid != file->gid;
        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);
+                       }
+                       if (change_gid) {
+                               rprintf(FINFO,
+                                   "set gid of %s from %ld to %ld\n",
+                                   fname, (long)st->st_gid, (long)file->gid);
+                       }
+               }
                if (do_lchown(fname,
                              change_uid?file->uid:st->st_uid,
                              change_gid?file->gid:st->st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                             unless have the privilege */
-                       rprintf(FERROR, "chown %s failed: %s\n",
+                       rprintf(FERROR, "%s %s failed: %s\n",
+                               change_uid ? "chown" : "chgrp",
                                full_fname(fname), strerror(errno));
                        return 0;
                }
@@ -254,27 +231,24 @@ void sig_int(void)
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 {
+       int ret;
+
        if (make_backups && !make_backup(fname))
                return;
 
        /* move tmp file over real file */
-       if (robust_rename(fnametmp,fname) != 0) {
-               if (errno == EXDEV) {
-                       /* rename failed on cross-filesystem link.
-                          Copy the file instead. */
-                       if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
-                               rprintf(FERROR, "copy %s -> \"%s\": %s\n",
-                                       full_fname(fnametmp), fname,
-                                       strerror(errno));
-                       } else {
-                               set_perms(fname,file,NULL,0);
-                       }
-               } else {
-                       rprintf(FERROR,"rename %s -> \"%s\": %s\n",
-                               full_fname(fnametmp), fname, strerror(errno));
-               }
+       ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+       if (ret != 0) {
+               rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+                   ret == -2 ? "copy" : "rename",
+                   full_fname(fnametmp), fname, strerror(errno));
                do_unlink(fnametmp);
        } else {
                set_perms(fname,file,NULL,0);
        }
 }
+
+const char *who_am_i(void)
+{
+    return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+}