int flags, disable_buffering;
int reading_remotely = filesfrom_host != NULL;
int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
- | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0)
- | (filesfrom_convert ? RL_CONVERT : 0);
+#ifdef ICONV_OPTION
+ | (filesfrom_convert ? RL_CONVERT : 0)
+#endif
+ | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
rprintf(FLOG, "building file list\n");
if (show_filelist_p())
}
} else if (io_filesfrom_f_in >= 0) {
if (FD_ISSET(io_filesfrom_f_in, &r_fds)) {
+#ifdef ICONV_OPTION
xbuf *ibuf = filesfrom_convert ? &iconv_buf : &ff_buf;
+#else
+ xbuf *ibuf = &ff_buf;
+#endif
int l = read(io_filesfrom_f_in, ibuf->buf, ibuf->size);
if (l <= 0) {
if (l == 0 || errno != EINTR) {
io_filesfrom_f_in = -1;
}
} else {
+#ifdef ICONV_OPTION
if (filesfrom_convert) {
iconv_buf.pos = 0;
iconv_buf.len = l;
ICB_EXPAND_OUT|ICB_INCLUDE_BAD|ICB_INCLUDE_INCOMPLETE);
l = ff_buf.len;
}
+#endif
if (!eol_nulls) {
char *s = ff_buf.buf + l;
/* Transform CR and/or LF into '\0' */
#endif
start:
+#ifdef ICONV_OPTION
s = flags & RL_CONVERT ? iconv_buf.buf : buf;
+#else
+ s = buf;
+#endif
eob = s + bufsiz - 1;
while (1) {
cnt = read(fd, &ch, 1);
int dot_pos = 0;
int argc = 0;
char **argv, *p;
- int rl_flags = (rl_nulls ? RL_EOL_NULLS : 0)
- | (protect_args && ic_recv != (iconv_t)-1 ? RL_CONVERT : 0);
+ int rl_flags = (rl_nulls ? RL_EOL_NULLS : 0);
+
+#ifdef ICONV_OPTION
+ rl_flags |= (protect_args && ic_recv != (iconv_t)-1 ? RL_CONVERT : 0);
+#endif
if (!(argv = new_array(char *, maxargs)))
out_of_memory("read_args");