mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-09 18:08:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed HAVE_ICONV to HAVE_ICONV_OPEN.

Browse Source
This commit is contained in:
Wayne Davison
2006-02-05 04:45:23 +00:00
parent 12c8cd02fc
commit c85631421d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
log.c
View File

@@ -26,7 +26,7 @@
<mbp@samba.org>, Oct 2000.
*/
#include "rsync.h"
#if defined HAVE_ICONV && defined HAVE_ICONV_H
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
#include <iconv.h>
#endif
@@ -46,7 +46,7 @@ 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;
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV_OPEN
extern iconv_t ic_chck;
#endif
@@ -204,7 +204,7 @@ static void filtered_fwrite(const char *buf, int len, FILE *f)
&& isdigit(*(uchar*)(s+2))
&& isdigit(*(uchar*)(s+3))
&& isdigit(*(uchar*)(s+4)))
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV_OPEN
|| (*(uchar*)s < ' ' && *s != '\t')
#else
|| ((!isprint(*(uchar*)s) || *(uchar*)s < ' ') && *s != '\t')
@@ -298,7 +298,7 @@ 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;
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV_OPEN
if (ic_chck != (iconv_t)-1) {
char convbuf[1024];
char *in_buf = buf, *out_buf = convbuf;

4
main.c
View File

@@ -792,7 +792,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV_OPEN
setup_iconv();
#endif
@@ -831,7 +831,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV_OPEN
setup_iconv();
#endif

4
rsync.c
View File

@@ -21,7 +21,7 @@
process */
#include "rsync.h"
#if defined HAVE_ICONV && defined HAVE_ICONV_H
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
#include <iconv.h>
#endif
#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
@@ -50,7 +50,7 @@ extern int keep_dirlinks;
extern int make_backups;
extern struct stats stats;
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV_OPEN
iconv_t ic_chck = (iconv_t)-1;
static char *default_charset(void)