aboutsummaryrefslogtreecommitdiffstats
path: root/rsync.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-08-01 18:15:28 -0700
committerWayne Davison <wayned@samba.org>2008-08-01 18:15:28 -0700
commitc9f540f37d594bb9ae46066e471644c5309c6664 (patch)
treee448dff939c945ae4048b6ca4b53ea1074555324 /rsync.c
parent0479eb76015913a40a2d0423bdd6cfeec4a3a3e3 (diff)
downloadandroid_external_rsync-c9f540f37d594bb9ae46066e471644c5309c6664.tar.gz
android_external_rsync-c9f540f37d594bb9ae46066e471644c5309c6664.tar.bz2
android_external_rsync-c9f540f37d594bb9ae46066e471644c5309c6664.zip
Changed the iconv-related message that was being output as the
lone --info=misc2 message into a --debug=iconv message so that all iconv info will be output when requesting iconv debugging.
Diffstat (limited to 'rsync.c')
-rw-r--r--rsync.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/rsync.c b/rsync.c
index 0e635b03..e1c061c9 100644
--- a/rsync.c
+++ b/rsync.c
@@ -80,23 +80,23 @@ void setup_iconv(void)
# endif
if (!am_server && !allow_8bit_chars) {
-
/* It's OK if this fails... */
ic_chck = iconv_open(defset, defset);
- if (DEBUG_GTE(ICONV, 1)) {
+ if (DEBUG_GTE(ICONV, 2)) {
if (ic_chck == (iconv_t)-1) {
rprintf(FINFO,
- "note: iconv_open(\"%s\", \"%s\") failed (%d)"
- " -- using isprint() instead of iconv().\n",
+ "msg checking via isprint()"
+ " (iconv_open(\"%s\", \"%s\") errno: %d)\n",
defset, defset, errno);
} else {
rprintf(FINFO,
- "note: iconv_open(\"%s\", \"%s\") succeeded.\n",
- defset, defset);
+ "msg checking charset: %s\n",
+ defset);
}
}
- }
+ } else
+ ic_chck = (iconv_t)-1;
# ifdef ICONV_OPTION
if (!iconv_opt)
@@ -126,10 +126,9 @@ void setup_iconv(void)
exit_cleanup(RERR_UNSUPPORTED);
}
- if (INFO_GTE(MISC, 2)) {
- rprintf(FINFO, "%s charset: %s\n",
- am_server ? "server" : "client",
- *charset ? charset : "[LOCALE]");
+ if (DEBUG_GTE(ICONV, 1)) {
+ rprintf(FINFO, "[%s] charset: %s\n",
+ who_am_i(), *charset ? charset : "[LOCALE]");
}
# endif
}