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;
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 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
+ return nl_langinfo(CODESET);
+#else
+ return ""; /* Works with (at the very least) gnu iconv... */
+#endif
+}
+
+void setup_iconv()
+{
+ if (!am_server && !allow_8bit_chars) {
+ const char *defset = default_charset();
+
+ /* 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
/*
free a sums struct
/* 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,
+ /* 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)) {
* 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 & ~orig_umask;
- return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
+ cur_mode = flist_mode & ACCESSPERMS & ~orig_umask;
+ return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
}
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))
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",