X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/998113fedf200f94ee3e361deed00a9bd6e7d2a7..5974c662ff09825ebfedb84ad300b113618f45f9:/log.c

diff --git a/log.c b/log.c
index bc8c747a..4b78d25b 100644
--- a/log.c
+++ b/log.c
@@ -26,6 +26,9 @@
   <mbp@samba.org>, Oct 2000.
   */
 #include "rsync.h"
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#include <iconv.h>
+#endif
 
 extern int verbose;
 extern int dry_run;
@@ -43,6 +46,9 @@ extern int log_format_has_o_or_i;
 extern int daemon_log_format_has_o_or_i;
 extern char *auth_user;
 extern char *log_format;
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+extern iconv_t ic_chck;
+#endif
 
 static int log_initialised;
 static int logfile_was_closed;
@@ -189,20 +195,21 @@ void logfile_reopen(void)
 	}
 }
 
-static void filtered_fwrite(const char *buf, int len, FILE *f)
+static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
 {
 	const char *s, *end = buf + len;
 	for (s = buf; s < end; s++) {
 		if ((s < end - 4
-		  && *s == '\\' && s[1] == '0'
+		  && *s == '\\' && s[1] == '#'
 		  && isdigit(*(uchar*)(s+2))
 		  && isdigit(*(uchar*)(s+3))
 		  && isdigit(*(uchar*)(s+4)))
-		 || ((!isprint(*(uchar*)s) || *(uchar*)s < ' ')
-		  && *s != '\t')) {
+		 || (*s != '\t'
+		  && ((use_isprint && !isprint(*(uchar*)s))
+		   || *(uchar*)s < ' '))) {
 			if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
 				exit_cleanup(RERR_MESSAGEIO);
-			fprintf(f, "\\%04o", *(uchar*)s);
+			fprintf(f, "\\#%03o", *(uchar*)s);
 			buf = s + 1;
 		}
 	}
@@ -288,7 +295,30 @@ void rwrite(enum logcode code, char *buf, int len)
 	trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
 			  ? buf[--len] : 0;
 
-	filtered_fwrite(buf, len, f);
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+	if (ic_chck != (iconv_t)-1) {
+		char convbuf[1024];
+		char *in_buf = buf, *out_buf = convbuf;
+		size_t in_cnt = len, out_cnt = sizeof convbuf - 1;
+
+		iconv(ic_chck, NULL, 0, NULL, 0);
+		while (iconv(ic_chck, &in_buf,&in_cnt,
+				 &out_buf,&out_cnt) == (size_t)-1) {
+			if (out_buf != convbuf) {
+				filtered_fwrite(f, convbuf, out_buf - convbuf, 0);
+				out_buf = convbuf;
+				out_cnt = sizeof convbuf - 1;
+			}
+			if (errno == E2BIG)
+				continue;
+			fprintf(f, "\\#%03o", *(uchar*)in_buf++);
+			in_cnt--;
+		}
+		if (out_buf != convbuf)
+			filtered_fwrite(f, convbuf, out_buf - convbuf, 0);
+	} else
+#endif
+		filtered_fwrite(f, buf, len, 1);
 
 	if (trailing_CR_or_NL) {
 		fputc(trailing_CR_or_NL, f);