summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
38943d2)
is a local_server copy, and so that arg-parsing code doesn't interfere
with the sending of a remote charset value.
*f_out_p = from_gen_pipe[1];
*f_in_p = batch_fd;
ret = -1; /* no child pid */
*f_out_p = from_gen_pipe[1];
*f_in_p = batch_fd;
ret = -1; /* no child pid */
} else if (local_server) {
/* If the user didn't request --[no-]whole-file, force
* it on, but only if we're not batch processing. */
if (whole_file < 0 && !write_batch)
whole_file = 1;
ret = local_child(argc, args, f_in_p, f_out_p, child_main);
} else if (local_server) {
/* If the user didn't request --[no-]whole-file, force
* it on, but only if we're not batch processing. */
if (whole_file < 0 && !write_batch)
whole_file = 1;
ret = local_child(argc, args, f_in_p, f_out_p, child_main);
if (protect_args) {
int fd;
#ifdef ICONV_OPTION
if (protect_args) {
int fd;
#ifdef ICONV_OPTION
if (write_batch < 0)
dry_run = 1;
if (write_batch < 0)
dry_run = 1;
- if (am_daemon && !am_server)
+ if (am_server)
+ setup_iconv();
+ else if (am_daemon)
return daemon_main();
if (am_server && protect_args) {
return daemon_main();
if (am_server && protect_args) {
else
need_unsorted_flist = 1;
}
else
need_unsorted_flist = 1;
}
#endif
if (protect_args == 1) {
#endif
if (protect_args == 1) {
close(to_child_pipe[0]);
if (from_child_pipe[1] != STDOUT_FILENO)
close(from_child_pipe[1]);
close(to_child_pipe[0]);
if (from_child_pipe[1] != STDOUT_FILENO)
close(from_child_pipe[1]);
child_main(argc, argv);
}
child_main(argc, argv);
}