- The iconv-supporting code can now ask filtered_fwrite() to use

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 2387879..48b2520 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -21,10 +21,19 @@
    process */
 
 #include "rsync.h"
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#include <iconv.h>
+#endif
+#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
+#include <libcharset.h>
+#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
+#include <langinfo.h>
+#endif
 
 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;
@@ -41,6 +50,35 @@ extern int keep_dirlinks;
 extern int make_backups;
 extern struct stats stats;
 
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+iconv_t ic_chck = (iconv_t)-1;
+
+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;
+#else
+       return ""; /* Works with (at the very least) gnu iconv... */
+#endif
+}
+
+void setup_iconv()
+{
+       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);
+       }
+}
+#endif
 
 /*
   free a sums struct
@@ -55,7 +93,7 @@ void free_sums(struct sum_struct *s)
  * 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,
+       /* 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)) {
@@ -68,7 +106,7 @@ mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists)
                                dest_mode |= (dest_mode & 0444) >> 2;
                }
        } else
-               dest_mode = flist_mode & ~orig_umask;
+               dest_mode = flist_mode & ACCESSPERMS & ~orig_umask;
        return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
 }
 
@@ -88,6 +126,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))