X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2d2f71fb27e8364eac8418e2303b9972c5766ae4..0f86c74eba2fea1f33f514eb5bca84a633f3d2d9:/rsync.c

diff --git a/rsync.c b/rsync.c
index ebccb13b..aa9eabec 100644
--- a/rsync.c
+++ b/rsync.c
@@ -43,6 +43,7 @@ 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;
@@ -66,26 +67,23 @@ static const char *default_charset(void)
 
 void setup_iconv()
 {
-	const char *defset;
+	if (!am_server && !allow_8bit_chars) {
+		const char *defset = default_charset();
 
-	if (!am_server)
-		return;
-
-	defset = default_charset();
-
-	/* It's OK if this fails... */
-	ic_chck = iconv_open(defset, defset);
+		/* 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);
+		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);
+			}
 		}
 	}
 }
@@ -148,7 +146,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",