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
22955408
Commit
22955408
authored
Sep 18, 2007
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing "#ifdef ICONV_OPTION" conditionals.
parent
4a1edb63
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
flist.c
flist.c
+4
-2
io.c
io.c
+15
-2
No files found.
flist.c
View file @
22955408
...
...
@@ -1645,8 +1645,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
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
())
...
...
io.c
View file @
22955408
...
...
@@ -674,7 +674,11 @@ static int read_timeout(int fd, char *buf, size_t len)
}
}
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
)
{
...
...
@@ -685,6 +689,7 @@ static int read_timeout(int fd, char *buf, size_t len)
io_filesfrom_f_in
=
-
1
;
}
}
else
{
#ifdef ICONV_OPTION
if
(
filesfrom_convert
)
{
iconv_buf
.
pos
=
0
;
iconv_buf
.
len
=
l
;
...
...
@@ -692,6 +697,7 @@ static int read_timeout(int fd, char *buf, size_t len)
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' */
...
...
@@ -771,7 +777,11 @@ int read_line(int fd, char *buf, size_t bufsiz, int flags)
#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
);
...
...
@@ -830,8 +840,11 @@ int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
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"
);
...
...
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