Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblongpath-rsync
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liblongpath
liblongpath-rsync
Commits
44c4492a
Commit
44c4492a
authored
Oct 10, 2007
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Conditionalize the call to setup_iconv().
parent
609e6dda
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
main.c
main.c
+10
-2
pipe.c
pipe.c
+2
-0
No files found.
main.c
View file @
44c4492a
...
...
@@ -448,16 +448,22 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
*
f_out_p
=
from_gen_pipe
[
1
];
*
f_in_p
=
batch_fd
;
ret
=
-
1
;
/* no child pid */
#ifdef ICONV_CONST
setup_iconv
();
#endif
}
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
);
#ifdef ICONV_CONST
setup_iconv
();
#endif
}
else
{
#ifdef ICONV_CONST
setup_iconv
();
#endif
if
(
protect_args
)
{
int
fd
;
#ifdef ICONV_OPTION
...
...
@@ -1479,9 +1485,11 @@ int main(int argc,char *argv[])
if
(
write_batch
<
0
)
dry_run
=
1
;
if
(
am_server
)
if
(
am_server
)
{
#ifdef ICONV_CONST
setup_iconv
();
else
if
(
am_daemon
)
#endif
}
else
if
(
am_daemon
)
return
daemon_main
();
if
(
am_server
&&
protect_args
)
{
...
...
pipe.c
View file @
44c4492a
...
...
@@ -144,7 +144,9 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
close
(
to_child_pipe
[
0
]);
if
(
from_child_pipe
[
1
]
!=
STDOUT_FILENO
)
close
(
from_child_pipe
[
1
]);
#ifdef ICONV_CONST
setup_iconv
();
#endif
child_main
(
argc
,
argv
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment