Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
An easy way to run all the commands in prepare-source.mak.
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
9a9f083
..
91b57d4
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-26,7
+26,7
@@
<mbp@samba.org>, Oct 2000.
*/
#include "rsync.h"
<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
#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;
extern int daemon_log_format_has_o_or_i;
extern char *auth_user;
extern char *log_format;
-#if
def HAVE_ICONV
+#if
defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
extern iconv_t ic_chck;
#endif
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)))
&& isdigit(*(uchar*)(s+2))
&& isdigit(*(uchar*)(s+3))
&& isdigit(*(uchar*)(s+4)))
-#if
def HAVE_ICONV
+#if
defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
|| (*(uchar*)s < ' ' && *s != '\t')
#else
|| ((!isprint(*(uchar*)s) || *(uchar*)s < ' ') && *s != '\t')
|| (*(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;
trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
? buf[--len] : 0;
-#if
def HAVE_ICONV
+#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;
if (ic_chck != (iconv_t)-1) {
char convbuf[1024];
char *in_buf = buf, *out_buf = convbuf;