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
b55115ec
Commit
b55115ec
authored
Jan 28, 2012
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix --only-write-batch hang with --hard-links.
Fixes bug 8565.
parent
f5e2b8f8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
generator.c
generator.c
+2
-1
hlink.c
hlink.c
+1
-1
receiver.c
receiver.c
+2
-0
No files found.
generator.c
View file @
b55115ec
...
...
@@ -81,6 +81,7 @@ extern int link_dest;
extern
int
whole_file
;
extern
int
list_only
;
extern
int
read_batch
;
extern
int
write_batch
;
extern
int
safe_symlinks
;
extern
long
block_size
;
/* "long" because popt can't set an int32. */
extern
int
unsort_ndx
;
...
...
@@ -1813,7 +1814,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
notify_others:
if
(
remove_source_files
&&
!
delay_updates
&&
!
phase
&&
!
dry_run
)
increment_active_files
(
ndx
,
itemizing
,
code
);
if
(
inc_recurse
&&
!
dry_run
)
if
(
inc_recurse
&&
(
!
dry_run
||
write_batch
<
0
)
)
cur_flist
->
in_progress
++
;
#ifdef SUPPORT_HARD_LINKS
if
(
preserve_hard_links
&&
F_IS_HLINKED
(
file
))
...
...
hlink.c
View file @
b55115ec
...
...
@@ -496,7 +496,7 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
int
prev_statret
,
ndx
,
prev_ndx
=
F_HL_PREV
(
file
);
if
(
stp
==
NULL
&&
prev_ndx
>=
0
)
{
if
(
link_stat
(
fname
,
&
st
,
0
)
<
0
)
{
if
(
link_stat
(
fname
,
&
st
,
0
)
<
0
&&
!
dry_run
)
{
rsyserr
(
FERROR_XFER
,
errno
,
"stat %s failed"
,
full_fname
(
fname
));
return
;
...
...
receiver.c
View file @
b55115ec
...
...
@@ -681,6 +681,8 @@ int recv_files(int f_in, int f_out, char *local_name)
log_item
(
FCLIENT
,
file
,
iflags
,
NULL
);
if
(
!
am_server
)
discard_receive_data
(
f_in
,
F_LENGTH
(
file
));
if
(
inc_recurse
)
send_msg_int
(
MSG_SUCCESS
,
ndx
);
continue
;
}
...
...
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