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
112d728f
Commit
112d728f
authored
Dec 05, 2006
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the latest F_*() accessors.
parent
96293cf9
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
67 deletions
+72
-67
generator.c
generator.c
+30
-33
hlink.c
hlink.c
+2
-3
io.c
io.c
+2
-2
log.c
log.c
+25
-15
receiver.c
receiver.c
+12
-13
sender.c
sender.c
+1
-1
No files found.
generator.c
View file @
112d728f
This diff is collapsed.
Click to expand it.
hlink.c
View file @
112d728f
...
...
@@ -28,7 +28,6 @@ extern int dry_run;
extern
int
do_xfers
;
extern
int
link_dest
;
extern
int
make_backups
;
extern
int
flist_extra_ndx
;
extern
int
remove_source_files
;
extern
int
stdout_format_has_i
;
extern
char
*
basis_dir
[];
...
...
@@ -106,7 +105,7 @@ static void link_idev_data(void)
file
->
flags
|=
FLAG_HLINK_LAST
;
F_HLIST
(
file
)
=
hl
;
}
else
file
->
flags
&=
~
FLAG_HLINK
_INFO
;
file
->
flags
&=
~
FLAG_HLINK
ED
;
}
if
(
!
to
)
{
...
...
@@ -138,7 +137,7 @@ void init_hard_links(void)
hlink_count
=
0
;
for
(
i
=
0
;
i
<
the_file_list
->
count
;
i
++
)
{
if
(
IS_HLINKED
(
FPTR
(
i
)))
if
(
F_
IS_HLINKED
(
FPTR
(
i
)))
hlink_list
[
hlink_count
++
]
=
i
;
}
...
...
io.c
View file @
112d728f
...
...
@@ -342,13 +342,13 @@ void increment_active_files(int ndx, int itemizing, enum logcode code)
}
active_filecnt
++
;
active_bytecnt
+=
the_file_list
->
files
[
ndx
]
->
length
;
active_bytecnt
+=
F_LENGTH
(
the_file_list
->
files
[
ndx
])
;
}
void
decrement_active_files
(
int
ndx
)
{
active_filecnt
--
;
active_bytecnt
-=
the_file_list
->
files
[
ndx
]
->
length
;
active_bytecnt
-=
F_LENGTH
(
the_file_list
->
files
[
ndx
])
;
}
/* Try to push messages off the list onto the wire. If we leave with more
...
...
log.c
View file @
112d728f
...
...
@@ -39,8 +39,6 @@ extern int protocol_version;
extern
int
preserve_times
;
extern
int
preserve_uid
;
extern
int
preserve_gid
;
extern
int
flist_extra_ndx
;
extern
int
file_struct_len
;
extern
int
stdout_format_has_i
;
extern
int
stdout_format_has_o_or_i
;
extern
int
logfile_format_has_i
;
...
...
@@ -427,8 +425,9 @@ void rflush(enum logcode code)
/* A generic logging routine for send/recv, with parameter substitiution. */
static
void
log_formatted
(
enum
logcode
code
,
const
char
*
format
,
const
char
*
op
,
struct
file_struct
*
file
,
struct
stats
*
initial_stats
,
int
iflags
,
const
char
*
hlink
)
struct
file_struct
*
file
,
const
char
*
fname
,
struct
stats
*
initial_stats
,
int
iflags
,
const
char
*
hlink
)
{
char
buf
[
MAXPATHLEN
+
1024
],
buf2
[
MAXPATHLEN
],
fmt
[
32
];
char
*
p
,
*
s
,
*
c
;
...
...
@@ -473,7 +472,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
case
'l'
:
strlcat
(
fmt
,
".0f"
,
sizeof
fmt
);
snprintf
(
buf2
,
sizeof
buf2
,
fmt
,
(
double
)
file
->
length
);
(
double
)
F_LENGTH
(
file
)
);
n
=
buf2
;
break
;
case
'U'
:
...
...
@@ -512,6 +511,10 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
n
=
op
;
break
;
case
'f'
:
if
(
fname
)
{
c
=
f_name_buf
();
strlcpy
(
c
,
fname
,
MAXPATHLEN
);
}
else
c
=
f_name
(
file
,
NULL
);
if
(
am_sender
&&
file
->
dir
.
root
)
{
pathjoin
(
buf2
,
sizeof
buf2
,
...
...
@@ -539,6 +542,10 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
n
++
;
break
;
case
'n'
:
if
(
fname
)
{
c
=
f_name_buf
();
strlcpy
(
c
,
fname
,
MAXPATHLEN
);
}
else
c
=
f_name
(
file
,
NULL
);
if
(
S_ISDIR
(
file
->
mode
))
strlcat
(
c
,
"/"
,
MAXPATHLEN
);
...
...
@@ -548,7 +555,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
if
(
hlink
&&
*
hlink
)
{
n
=
hlink
;
strlcpy
(
buf2
,
" => "
,
sizeof
buf2
);
}
else
if
(
S_ISLNK
(
file
->
mode
))
{
}
else
if
(
S_ISLNK
(
file
->
mode
)
&&
!
fname
)
{
n
=
F_SYMLINK
(
file
);
strlcpy
(
buf2
,
" -> "
,
sizeof
buf2
);
}
else
{
...
...
@@ -708,11 +715,11 @@ void log_item(enum logcode code, struct file_struct *file,
if
(
code
!=
FLOG
&&
stdout_format
&&
!
am_server
)
{
log_formatted
(
FCLIENT
,
stdout_format
,
s_or_r
,
file
,
initial_stats
,
iflags
,
hlink
);
file
,
NULL
,
initial_stats
,
iflags
,
hlink
);
}
if
(
code
!=
FCLIENT
&&
logfile_format
&&
*
logfile_format
)
{
log_formatted
(
FLOG
,
logfile_format
,
s_or_r
,
file
,
initial_stats
,
iflags
,
hlink
);
file
,
NULL
,
initial_stats
,
iflags
,
hlink
);
}
}
...
...
@@ -736,12 +743,15 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
void
log_delete
(
const
char
*
fname
,
int
mode
)
{
static
struct
file_struct
file
;
static
struct
{
union
flist_extras
ex
[
4
];
/* just in case... */
struct
file_struct
file
;
char
basename
[
1
];
}
x
;
int
len
=
strlen
(
fname
);
const
char
*
fmt
;
file
.
mode
=
mode
;
file
.
basename
=
fname
;
x
.
file
.
mode
=
mode
;
if
(
!
verbose
&&
!
stdout_format
)
;
...
...
@@ -751,7 +761,7 @@ void log_delete(const char *fname, int mode)
send_msg
(
MSG_DELETED
,
fname
,
len
);
}
else
{
fmt
=
stdout_format_has_o_or_i
?
stdout_format
:
"deleting %n"
;
log_formatted
(
FCLIENT
,
fmt
,
"del."
,
&
fil
e
,
&
stats
,
log_formatted
(
FCLIENT
,
fmt
,
"del."
,
&
x
.
file
,
fnam
e
,
&
stats
,
ITEM_DELETED
,
NULL
);
}
...
...
@@ -759,7 +769,7 @@ void log_delete(const char *fname, int mode)
return
;
fmt
=
logfile_format_has_o_or_i
?
logfile_format
:
"deleting %n"
;
log_formatted
(
FLOG
,
fmt
,
"del."
,
&
fil
e
,
&
stats
,
ITEM_DELETED
,
NULL
);
log_formatted
(
FLOG
,
fmt
,
"del."
,
&
x
.
file
,
fnam
e
,
&
stats
,
ITEM_DELETED
,
NULL
);
}
/*
...
...
receiver.c
View file @
112d728f
...
...
@@ -39,7 +39,6 @@ extern int preserve_hard_links;
extern
int
preserve_perms
;
extern
int
basis_dir_cnt
;
extern
int
make_backups
;
extern
int
flist_extra_ndx
;
extern
int
cleanup_got_literal
;
extern
int
remove_source_files
;
extern
int
append_mode
;
...
...
@@ -301,7 +300,7 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name)
full_fname
(
fname
),
partialptr
);
}
else
{
if
(
remove_source_files
||
(
preserve_hard_links
&&
IS_HLINKED
(
file
)))
||
(
preserve_hard_links
&&
F_
IS_HLINKED
(
file
)))
send_msg_int
(
MSG_SUCCESS
,
i
);
handle_partial_dir
(
partialptr
,
PDIR_DELETE
);
}
...
...
@@ -414,7 +413,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
stats
.
current_file_index
=
i
;
stats
.
num_transferred_files
++
;
stats
.
total_transferred_size
+=
file
->
length
;
stats
.
total_transferred_size
+=
F_LENGTH
(
file
)
;
cleanup_got_literal
=
0
;
if
(
server_filter_list
.
head
...
...
@@ -426,13 +425,13 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
if
(
!
do_xfers
)
{
/* log the transfer */
log_item
(
FCLIENT
,
file
,
&
stats
,
iflags
,
NULL
);
if
(
read_batch
)
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
continue
;
}
if
(
write_batch
<
0
)
{
log_item
(
FINFO
,
file
,
&
stats
,
iflags
,
NULL
);
if
(
!
am_server
)
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
continue
;
}
...
...
@@ -442,7 +441,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
rprintf
(
FINFO
,
"(Skipping batched update for
\"
%s
\"
)
\n
"
,
fname
);
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
continue
;
}
next_gen_i
=
-
1
;
...
...
@@ -524,7 +523,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
}
else
if
(
do_fstat
(
fd1
,
&
st
)
!=
0
)
{
rsyserr
(
FERROR
,
errno
,
"fstat %s failed"
,
full_fname
(
fnamecmp
));
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
close
(
fd1
);
continue
;
}
...
...
@@ -537,7 +536,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
*/
rprintf
(
FERROR
,
"recv_files: %s is a directory
\n
"
,
full_fname
(
fnamecmp
));
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
close
(
fd1
);
continue
;
}
...
...
@@ -560,14 +559,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
if
(
fd2
==
-
1
)
{
rsyserr
(
FERROR
,
errno
,
"open %s failed"
,
full_fname
(
fname
));
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
if
(
fd1
!=
-
1
)
close
(
fd1
);
continue
;
}
}
else
{
if
(
!
get_tmpname
(
fnametmp
,
fname
))
{
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
if
(
fd1
!=
-
1
)
close
(
fd1
);
continue
;
...
...
@@ -593,7 +592,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
if
(
fd2
==
-
1
)
{
rsyserr
(
FERROR
,
errno
,
"mkstemp %s failed"
,
full_fname
(
fnametmp
));
discard_receive_data
(
f_in
,
file
->
length
);
discard_receive_data
(
f_in
,
F_LENGTH
(
file
)
);
if
(
fd1
!=
-
1
)
close
(
fd1
);
continue
;
...
...
@@ -610,7 +609,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
/* recv file data */
recv_ok
=
receive_data
(
f_in
,
fnamecmp
,
fd1
,
st
.
st_size
,
fname
,
fd2
,
file
->
length
);
fname
,
fd2
,
F_LENGTH
(
file
)
);
log_item
(
log_code
,
file
,
&
initial_stats
,
iflags
,
NULL
);
...
...
@@ -653,7 +652,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
if
(
recv_ok
>
0
)
{
if
(
remove_source_files
||
(
preserve_hard_links
&&
IS_HLINKED
(
file
)))
||
(
preserve_hard_links
&&
F_
IS_HLINKED
(
file
)))
send_msg_int
(
MSG_SUCCESS
,
i
);
}
else
if
(
!
recv_ok
)
{
enum
logcode
msgtype
=
phase
||
read_batch
?
FERROR
:
FINFO
;
...
...
sender.c
View file @
112d728f
...
...
@@ -230,7 +230,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
stats
.
current_file_index
=
i
;
stats
.
num_transferred_files
++
;
stats
.
total_transferred_size
+=
file
->
length
;
stats
.
total_transferred_size
+=
F_LENGTH
(
file
)
;
if
(
!
do_xfers
)
{
/* log the transfer */
log_item
(
FCLIENT
,
file
,
&
stats
,
iflags
,
NULL
);
...
...
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