In dest_mode(), we now apply any "incoming chmod" changes from

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 28d9612..8ff841d 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -43,12 +43,14 @@ extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int am_starting_up;
+extern int allow_8bit_chars;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int inplace;
 extern int keep_dirlinks;
 extern int make_backups;
 extern struct stats stats;
+extern struct chmod_mode_struct *daemon_chmod_modes;
 
 #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
 iconv_t ic_chck = (iconv_t)-1;
@@ -58,10 +60,7 @@ static const char *default_charset(void)
 #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
        return locale_charset();
 #elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
-       const char *def = nl_langinfo(CODESET);
-       if (strcmp(def, "646") == 0) /* Solaris brain-damage */
-               return "ascii";
-       return def;
+       return nl_langinfo(CODESET);
 #else
        return ""; /* Works with (at the very least) gnu iconv... */
 #endif
@@ -69,13 +68,24 @@ static const char *default_charset(void)
 
 void setup_iconv()
 {
-       const char *defset = default_charset();
+       if (!am_server && !allow_8bit_chars) {
+               const char *defset = default_charset();
 
-       if (!am_server
-        && (ic_chck = iconv_open(defset, defset)) == (iconv_t)-1) {
-               rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n",
-                       defset, defset);
-               exit_cleanup(RERR_UNSUPPORTED);
+               /* It's OK if this fails... */
+               ic_chck = iconv_open(defset, defset);
+
+               if (verbose > 3) {
+                       if (ic_chck == (iconv_t)-1) {
+                               rprintf(FINFO,
+                                       "note: iconv_open(\"%s\", \"%s\") failed (%d)"
+                                       " -- using isprint() instead of iconv().\n",
+                                       defset, defset, errno);
+                       } else {
+                               rprintf(FINFO,
+                                       "note: iconv_open(\"%s\", \"%s\") succeeded.\n",
+                                       defset, defset);
+                       }
+               }
        }
 }
 #endif
@@ -91,7 +101,7 @@ void free_sums(struct sum_struct *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)
+mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int exists)
 {
        /* If the file already exists, we'll return the local permissions,
         * possibly tweaked by the --executability option. */
@@ -101,13 +111,15 @@ mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists)
                         * 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;
+                               cur_mode &= ~0111;
+                       else if (!(cur_mode & 0111))
+                               cur_mode |= (cur_mode & 0444) >> 2;
                }
        } else
-               dest_mode = flist_mode & ACCESSPERMS & ~orig_umask;
-       return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
+               cur_mode = flist_mode & ACCESSPERMS & ~orig_umask;
+       if (daemon_chmod_modes && !S_ISLNK(flist_mode))
+               cur_mode = tweak_mode(cur_mode, daemon_chmod_modes);
+       return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
 }
 
 int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
@@ -137,7 +149,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
        if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
                flags |= ATTRS_SKIP_MTIME;
        if (!(flags & ATTRS_SKIP_MTIME)
-           && cmp_modtime(st->st_mtime, file->modtime) != 0) {
+           && cmp_time(st->st_mtime, file->modtime) != 0) {
                int ret = set_modtime(fname, file->modtime, st->st_mode);
                if (ret < 0) {
                        rsyserr(FERROR, errno, "failed to set times on %s",