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
6087ef2a
Commit
6087ef2a
authored
Mar 10, 2005
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Changed read_item_attrs() to return the length of the xname string.
- Tweaked the order of the args to write_item_attrs().
parent
1f1d368a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
17 deletions
+16
-17
sender.c
sender.c
+16
-17
No files found.
sender.c
View file @
6087ef2a
...
@@ -125,8 +125,8 @@ void successful_send(int ndx)
...
@@ -125,8 +125,8 @@ void successful_send(int ndx)
}
}
}
}
static
void
write_item_attrs
(
int
f_out
,
int
ndx
,
int
iflags
,
char
*
buf
,
static
void
write_item_attrs
(
int
f_out
,
int
ndx
,
int
iflags
,
uchar
fnamecmp_type
,
int
len
)
uchar
fnamecmp_type
,
char
*
buf
,
int
len
)
{
{
write_int
(
f_out
,
ndx
);
write_int
(
f_out
,
ndx
);
if
(
protocol_version
<
29
)
if
(
protocol_version
<
29
)
...
@@ -142,7 +142,8 @@ static void write_item_attrs(int f_out, int ndx, int iflags, char *buf,
...
@@ -142,7 +142,8 @@ static void write_item_attrs(int f_out, int ndx, int iflags, char *buf,
}
}
/* This is also used by receive.c with f_out = -1. */
/* This is also used by receive.c with f_out = -1. */
int
read_item_attrs
(
int
f_in
,
int
f_out
,
int
ndx
,
char
*
buf
,
uchar
*
type_ptr
)
int
read_item_attrs
(
int
f_in
,
int
f_out
,
int
ndx
,
uchar
*
type_ptr
,
char
*
buf
,
int
*
len_ptr
)
{
{
int
len
;
int
len
;
uchar
fnamecmp_type
=
FNAMECMP_FNAME
;
uchar
fnamecmp_type
=
FNAMECMP_FNAME
;
...
@@ -174,6 +175,7 @@ int read_item_attrs(int f_in, int f_out, int ndx, char *buf, uchar *type_ptr)
...
@@ -174,6 +175,7 @@ int read_item_attrs(int f_in, int f_out, int ndx, char *buf, uchar *type_ptr)
*
buf
=
'\0'
;
*
buf
=
'\0'
;
len
=
-
1
;
len
=
-
1
;
}
}
*
len_ptr
=
len
;
/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
if
(
protocol_version
>=
29
&&
iflags
&
ITEM_TRANSFER
if
(
protocol_version
>=
29
&&
iflags
&
ITEM_TRANSFER
...
@@ -191,7 +193,7 @@ int read_item_attrs(int f_in, int f_out, int ndx, char *buf, uchar *type_ptr)
...
@@ -191,7 +193,7 @@ int read_item_attrs(int f_in, int f_out, int ndx, char *buf, uchar *type_ptr)
}
}
}
else
if
(
f_out
>=
0
)
{
}
else
if
(
f_out
>=
0
)
{
write_item_attrs
(
f_out
,
ndx
,
isave
/*XXX iflags */
,
write_item_attrs
(
f_out
,
ndx
,
isave
/*XXX iflags */
,
buf
,
fnamecmp_type
,
len
);
fnamecmp_type
,
buf
,
len
);
}
}
return
iflags
;
return
iflags
;
...
@@ -204,9 +206,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
...
@@ -204,9 +206,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
struct
map_struct
*
mbuf
=
NULL
;
struct
map_struct
*
mbuf
=
NULL
;
STRUCT_STAT
st
;
STRUCT_STAT
st
;
char
*
fname2
,
fname
[
MAXPATHLEN
];
char
*
fname2
,
fname
[
MAXPATHLEN
];
char
fnametmp
[
MAXPATHLEN
];
char
xname
[
MAXPATHLEN
];
uchar
fnamecmp_type
;
uchar
fnamecmp_type
;
int
iflags
;
int
iflags
,
xlen
;
struct
file_struct
*
file
;
struct
file_struct
*
file
;
int
phase
=
0
;
int
phase
=
0
;
struct
stats
initial_stats
;
struct
stats
initial_stats
;
...
@@ -237,8 +239,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
...
@@ -237,8 +239,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
break
;
break
;
}
}
iflags
=
read_item_attrs
(
f_in
,
f_out
,
i
,
fnametmp
,
iflags
=
read_item_attrs
(
f_in
,
f_out
,
i
,
&
fnamecmp_type
,
&
fnamecmp_type
);
xname
,
&
xlen
);
if
(
iflags
==
ITEM_IS_NEW
)
/* no-op packet */
if
(
iflags
==
ITEM_IS_NEW
)
/* no-op packet */
continue
;
continue
;
...
@@ -256,15 +258,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
...
@@ -256,15 +258,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
rprintf
(
FINFO
,
"send_files(%d, %s)
\n
"
,
i
,
fname
);
rprintf
(
FINFO
,
"send_files(%d, %s)
\n
"
,
i
,
fname
);
if
(
!
(
iflags
&
ITEM_TRANSFER
))
{
if
(
!
(
iflags
&
ITEM_TRANSFER
))
{
maybe_log_item
(
file
,
iflags
,
itemizing
,
fnametmp
);
maybe_log_item
(
file
,
iflags
,
itemizing
,
xname
);
continue
;
continue
;
}
}
if
(
protocol_version
>=
29
)
{
updating_basis_file
=
inplace
&&
(
protocol_version
>=
29
updating_basis_file
=
inplace
?
fnamecmp_type
==
FNAMECMP_FNAME
:
!
make_backups
);
&&
fnamecmp_type
==
FNAMECMP_FNAME
;
}
else
updating_basis_file
=
inplace
&&
!
make_backups
;
stats
.
current_file_index
=
i
;
stats
.
current_file_index
=
i
;
stats
.
num_transferred_files
++
;
stats
.
num_transferred_files
++
;
...
@@ -273,8 +272,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
...
@@ -273,8 +272,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
if
(
dry_run
)
{
/* log the transfer */
if
(
dry_run
)
{
/* log the transfer */
if
(
!
am_server
&&
log_format
)
if
(
!
am_server
&&
log_format
)
log_item
(
file
,
&
stats
,
iflags
,
NULL
);
log_item
(
file
,
&
stats
,
iflags
,
NULL
);
write_item_attrs
(
f_out
,
i
,
iflags
,
fname
tmp
,
write_item_attrs
(
f_out
,
i
,
iflags
,
fname
cmp_type
,
fnamecmp_type
,
-
1
);
xname
,
xlen
);
continue
;
continue
;
}
}
...
@@ -325,7 +324,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
...
@@ -325,7 +324,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
safe_fname
(
fname
),
(
double
)
st
.
st_size
);
safe_fname
(
fname
),
(
double
)
st
.
st_size
);
}
}
write_item_attrs
(
f_out
,
i
,
iflags
,
fname
tmp
,
fnamecmp_type
,
-
1
);
write_item_attrs
(
f_out
,
i
,
iflags
,
fname
cmp_type
,
xname
,
xlen
);
write_sum_head
(
f_out
,
s
);
write_sum_head
(
f_out
,
s
);
if
(
verbose
>
2
)
{
if
(
verbose
>
2
)
{
...
...
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