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
69be312b
Commit
69be312b
authored
Jan 30, 2011
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some minor variable and flag cleanup.
parent
4b4bcbe6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
13 deletions
+9
-13
flist.c
flist.c
+3
-5
generator.c
generator.c
+1
-3
log.c
log.c
+0
-2
rsync.c
rsync.c
+0
-2
rsync.h
rsync.h
+5
-1
No files found.
flist.c
View file @
69be312b
...
@@ -52,12 +52,9 @@ extern int preserve_devices;
...
@@ -52,12 +52,9 @@ extern int preserve_devices;
extern
int
preserve_specials
;
extern
int
preserve_specials
;
extern
int
delete_during
;
extern
int
delete_during
;
extern
int
missing_args
;
extern
int
missing_args
;
extern
int
uid_ndx
;
extern
int
gid_ndx
;
extern
int
eol_nulls
;
extern
int
eol_nulls
;
extern
int
relative_paths
;
extern
int
relative_paths
;
extern
int
implied_dirs
;
extern
int
implied_dirs
;
extern
int
file_extra_cnt
;
extern
int
ignore_perishable
;
extern
int
ignore_perishable
;
extern
int
non_perishable_cnt
;
extern
int
non_perishable_cnt
;
extern
int
prune_empty_dirs
;
extern
int
prune_empty_dirs
;
...
@@ -3177,13 +3174,14 @@ char *f_name(const struct file_struct *f, char *fbuf)
...
@@ -3177,13 +3174,14 @@ char *f_name(const struct file_struct *f, char *fbuf)
* of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
* of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
* buffer (the functions we call will append names onto the end, but the old
* buffer (the functions we call will append names onto the end, but the old
* dir value will be restored on exit). */
* dir value will be restored on exit). */
struct
file_list
*
get_dirlist
(
char
*
dirname
,
int
dlen
,
int
ignore_filter_rule
s
)
struct
file_list
*
get_dirlist
(
char
*
dirname
,
int
dlen
,
int
flag
s
)
{
{
struct
file_list
*
dirlist
;
struct
file_list
*
dirlist
;
char
dirbuf
[
MAXPATHLEN
];
char
dirbuf
[
MAXPATHLEN
];
int
save_recurse
=
recurse
;
int
save_recurse
=
recurse
;
int
save_xfer_dirs
=
xfer_dirs
;
int
save_xfer_dirs
=
xfer_dirs
;
int
save_prune_empty_dirs
=
prune_empty_dirs
;
int
save_prune_empty_dirs
=
prune_empty_dirs
;
int
senddir_fd
=
flags
&
GDL_IGNORE_FILTER_RULES
?
-
2
:
-
1
;
if
(
dlen
<
0
)
{
if
(
dlen
<
0
)
{
dlen
=
strlcpy
(
dirbuf
,
dirname
,
MAXPATHLEN
);
dlen
=
strlcpy
(
dirbuf
,
dirname
,
MAXPATHLEN
);
...
@@ -3196,7 +3194,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
...
@@ -3196,7 +3194,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
recurse
=
0
;
recurse
=
0
;
xfer_dirs
=
1
;
xfer_dirs
=
1
;
send_directory
(
ignore_filter_rules
?
-
2
:
-
1
,
dirlist
,
dirname
,
dlen
,
FLAG_CONTENT_DIR
);
send_directory
(
senddir_fd
,
dirlist
,
dirname
,
dlen
,
FLAG_CONTENT_DIR
);
xfer_dirs
=
save_xfer_dirs
;
xfer_dirs
=
save_xfer_dirs
;
recurse
=
save_recurse
;
recurse
=
save_recurse
;
if
(
INFO_GTE
(
PROGRESS
,
1
))
if
(
INFO_GTE
(
PROGRESS
,
1
))
...
...
generator.c
View file @
69be312b
...
@@ -44,8 +44,6 @@ extern int preserve_hard_links;
...
@@ -44,8 +44,6 @@ extern int preserve_hard_links;
extern
int
preserve_executability
;
extern
int
preserve_executability
;
extern
int
preserve_perms
;
extern
int
preserve_perms
;
extern
int
preserve_times
;
extern
int
preserve_times
;
extern
int
uid_ndx
;
extern
int
gid_ndx
;
extern
int
delete_mode
;
extern
int
delete_mode
;
extern
int
delete_before
;
extern
int
delete_before
;
extern
int
delete_during
;
extern
int
delete_during
;
...
@@ -1233,7 +1231,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
...
@@ -1233,7 +1231,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
if
(
need_fuzzy_dirlist
&&
S_ISREG
(
file
->
mode
))
{
if
(
need_fuzzy_dirlist
&&
S_ISREG
(
file
->
mode
))
{
strlcpy
(
fnamecmpbuf
,
dn
,
sizeof
fnamecmpbuf
);
strlcpy
(
fnamecmpbuf
,
dn
,
sizeof
fnamecmpbuf
);
fuzzy_dirlist
=
get_dirlist
(
fnamecmpbuf
,
-
1
,
1
);
fuzzy_dirlist
=
get_dirlist
(
fnamecmpbuf
,
-
1
,
GDL_IGNORE_FILTER_RULES
);
need_fuzzy_dirlist
=
0
;
need_fuzzy_dirlist
=
0
;
}
}
...
...
log.c
View file @
69be312b
...
@@ -37,8 +37,6 @@ extern int protocol_version;
...
@@ -37,8 +37,6 @@ extern int protocol_version;
extern
int
always_checksum
;
extern
int
always_checksum
;
extern
int
preserve_times
;
extern
int
preserve_times
;
extern
int
msgs2stderr
;
extern
int
msgs2stderr
;
extern
int
uid_ndx
;
extern
int
gid_ndx
;
extern
int
stdout_format_has_i
;
extern
int
stdout_format_has_i
;
extern
int
stdout_format_has_o_or_i
;
extern
int
stdout_format_has_o_or_i
;
extern
int
logfile_format_has_i
;
extern
int
logfile_format_has_i
;
...
...
rsync.c
View file @
69be312b
...
@@ -41,8 +41,6 @@ extern int am_generator;
...
@@ -41,8 +41,6 @@ extern int am_generator;
extern
int
am_starting_up
;
extern
int
am_starting_up
;
extern
int
allow_8bit_chars
;
extern
int
allow_8bit_chars
;
extern
int
protocol_version
;
extern
int
protocol_version
;
extern
int
uid_ndx
;
extern
int
gid_ndx
;
extern
int
inc_recurse
;
extern
int
inc_recurse
;
extern
int
inplace
;
extern
int
inplace
;
extern
int
flist_eof
;
extern
int
flist_eof
;
...
...
rsync.h
View file @
69be312b
...
@@ -85,8 +85,12 @@
...
@@ -85,8 +85,12 @@
/* These flags are passed to functions but not stored. */
/* These flags are passed to functions but not stored. */
#define FLAG_DIVERT_DIRS (1<<16)
/* sender
*/
#define FLAG_DIVERT_DIRS (1<<16)
/* sender, but must be unique
*/
/* These flags are for get_dirlist(). */
#define GDL_IGNORE_FILTER_RULES (1<<0)
/* Some helper macros for matching bits. */
#define BITS_SET(val,bits) (((val) & (bits)) == (bits))
#define BITS_SET(val,bits) (((val) & (bits)) == (bits))
#define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
#define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
#define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \
#define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \
...
...
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