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
d0221f1d
Commit
d0221f1d
authored
Jan 21, 2007
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed handling of "redo" items in protocol 30.
parent
3be97bf9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
receiver.c
receiver.c
+8
-5
No files found.
receiver.c
View file @
d0221f1d
...
...
@@ -57,7 +57,7 @@ extern struct file_list *cur_flist, *first_flist;
extern
struct
filter_list_struct
server_filter_list
;
static
struct
bitbag
*
delayed_bits
=
NULL
;
static
int
phase
=
0
;
static
int
phase
=
0
,
redoing
=
0
;
/* We're either updating the basis file or an identical copy: */
static
int
updating_basis
;
...
...
@@ -314,7 +314,7 @@ static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx)
if
(
next_gen_ndx
>=
0
)
{
rprintf
(
FINFO
,
"(No batched update for%s
\"
%s
\"
)
\n
"
,
phase
?
" resend of"
:
""
,
redoing
?
" resend of"
:
""
,
f_name
(
cur_flist
->
files
[
next_gen_ndx
],
NULL
));
}
next_gen_ndx
=
read_int
(
fd
);
...
...
@@ -412,6 +412,7 @@ int recv_files(int f_in, char *local_name)
append_mode
=
-
append_mode
;
sparse_files
=
-
sparse_files
;
csum_length
=
SUM_LENGTH
;
redoing
=
1
;
}
}
else
{
if
(
csum_length
!=
SHORT_SUM_LENGTH
)
{
...
...
@@ -420,6 +421,7 @@ int recv_files(int f_in, char *local_name)
append_mode
=
-
append_mode
;
sparse_files
=
-
sparse_files
;
csum_length
=
SHORT_SUM_LENGTH
;
redoing
=
0
;
}
}
...
...
@@ -667,7 +669,7 @@ int recv_files(int f_in, char *local_name)
||
(
preserve_hard_links
&&
F_IS_HLINKED
(
file
)))
send_msg_int
(
MSG_SUCCESS
,
ndx
);
}
else
if
(
!
recv_ok
)
{
enum
logcode
msgtype
=
phase
||
read_batch
?
FERROR
:
FINFO
;
enum
logcode
msgtype
=
redoing
||
read_batch
?
FERROR
:
FINFO
;
if
(
msgtype
==
FERROR
||
verbose
)
{
char
*
errstr
,
*
redostr
,
*
keptstr
;
if
(
!
(
keep_partial
&&
partialptr
)
&&
!
inplace
)
...
...
@@ -687,10 +689,11 @@ int recv_files(int f_in, char *local_name)
"%s: %s failed verification -- update %s%s.
\n
"
,
errstr
,
fname
,
keptstr
,
redostr
);
}
if
(
!
phase
||
incremental
)
{
if
(
!
redoing
)
{
send_msg_int
(
MSG_REDO
,
ndx
);
file
->
flags
|=
FLAG_FILE_SENT
;
}
}
else
if
(
incremental
)
send_msg_int
(
MSG_NO_SEND
,
ndx
);
}
}
if
(
make_backups
<
0
)
...
...
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