- Changed the check for iconv_open() to just iconv().

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 68d5026..6d1ee8f 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -25,8 +25,11 @@
 extern int verbose;
 extern int dry_run;
 extern int daemon_log_format_has_i;
+extern int preserve_perms;
+extern int preserve_executability;
 extern int preserve_times;
 extern int omit_dir_times;
+extern int orig_umask;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
@@ -49,6 +52,27 @@ void free_sums(struct sum_struct *s)
        free(s);
 }
 
+/* This is only called when we aren't preserving permissions.  Figure out what
+ * the permissions should be and return them merged back into the mode. */
+mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists)
+{
+       /* If the file already exists, we'll return the local permissions,
+        * possibly tweaked by the --executability option. */
+       if (exists) {
+               if (preserve_executability && S_ISREG(flist_mode)) {
+                       /* If the source file is executable, grant execute
+                        * rights to everyone who can read, but ONLY if the
+                        * file isn't already executable. */
+                       if (!(flist_mode & 0111))
+                               dest_mode &= ~0111;
+                       else if (!(dest_mode & 0111))
+                               dest_mode |= (dest_mode & 0444) >> 2;
+               }
+       } else
+               dest_mode = flist_mode & ACCESSPERMS & ~orig_umask;
+       return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
+}
+
 int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
                   int flags)
 {
@@ -65,6 +89,12 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
                        return 0;
                }
                st = &st2;
+               if (!preserve_perms && S_ISDIR(file->mode)
+                && st->st_mode & S_ISGID) {
+                       /* We just created this directory and its setgid
+                        * bit is on, so make sure it stays on. */
+                       file->mode |= S_ISGID;
+               }
        }
 
        if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
@@ -149,7 +179,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
        return updated;
 }
 
-void sig_int(void)
+RETSIGTYPE sig_int(UNUSED(int val))
 {
        /* KLUGE: if the user hits Ctrl-C while ssh is prompting
         * for a password, then our cleanup's sending of a SIGUSR1