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
b32d4254
Commit
b32d4254
authored
May 23, 2009
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change filter MATCHFLGs to FILTRULEs.
parent
134f97c9
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
175 additions
and
175 deletions
+175
-175
batch.c
batch.c
+2
-2
clientserver.c
clientserver.c
+4
-4
compat.c
compat.c
+3
-3
exclude.c
exclude.c
+138
-138
options.c
options.c
+2
-2
rsync.h
rsync.h
+26
-26
No files found.
batch.c
View file @
b32d4254
...
...
@@ -196,10 +196,10 @@ static void write_filter_rules(int fd)
write_sbuf
(
fd
,
" <<'#E#'
\n
"
);
for
(
ent
=
filter_list
.
head
;
ent
;
ent
=
ent
->
next
)
{
unsigned
int
plen
;
char
*
p
=
get_rule_prefix
(
ent
->
match_
flags
,
"- "
,
0
,
&
plen
);
char
*
p
=
get_rule_prefix
(
ent
->
r
flags
,
"- "
,
0
,
&
plen
);
write_buf
(
fd
,
p
,
plen
);
write_sbuf
(
fd
,
ent
->
pattern
);
if
(
ent
->
match_flags
&
MATCHFLG
_DIRECTORY
)
if
(
ent
->
rflags
&
FILTRULE
_DIRECTORY
)
write_byte
(
fd
,
'/'
);
write_byte
(
fd
,
eol_nulls
?
0
:
'\n'
);
}
...
...
clientserver.c
View file @
b32d4254
...
...
@@ -620,16 +620,16 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
set_filter_dir
(
module_dir
,
module_dirlen
);
p
=
lp_filter
(
i
);
parse_rule
(
&
daemon_filter_list
,
p
,
MATCHFLG
_WORD_SPLIT
,
parse_rule
(
&
daemon_filter_list
,
p
,
FILTRULE
_WORD_SPLIT
,
XFLG_ABS_IF_SLASH
|
XFLG_DIR2WILD3
);
p
=
lp_include_from
(
i
);
parse_filter_file
(
&
daemon_filter_list
,
p
,
MATCHFLG
_INCLUDE
,
parse_filter_file
(
&
daemon_filter_list
,
p
,
FILTRULE
_INCLUDE
,
XFLG_ABS_IF_SLASH
|
XFLG_DIR2WILD3
|
XFLG_OLD_PREFIXES
|
XFLG_FATAL_ERRORS
);
p
=
lp_include
(
i
);
parse_rule
(
&
daemon_filter_list
,
p
,
MATCHFLG_INCLUDE
|
MATCHFLG
_WORD_SPLIT
,
FILTRULE_INCLUDE
|
FILTRULE
_WORD_SPLIT
,
XFLG_ABS_IF_SLASH
|
XFLG_DIR2WILD3
|
XFLG_OLD_PREFIXES
);
p
=
lp_exclude_from
(
i
);
...
...
@@ -637,7 +637,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
XFLG_ABS_IF_SLASH
|
XFLG_DIR2WILD3
|
XFLG_OLD_PREFIXES
|
XFLG_FATAL_ERRORS
);
p
=
lp_exclude
(
i
);
parse_rule
(
&
daemon_filter_list
,
p
,
MATCHFLG
_WORD_SPLIT
,
parse_rule
(
&
daemon_filter_list
,
p
,
FILTRULE
_WORD_SPLIT
,
XFLG_ABS_IF_SLASH
|
XFLG_DIR2WILD3
|
XFLG_OLD_PREFIXES
);
log_init
(
1
);
...
...
compat.c
View file @
b32d4254
...
...
@@ -291,10 +291,10 @@ void setup_protocol(int f_out,int f_in)
unsort_ndx
=
++
file_extra_cnt
;
if
(
partial_dir
&&
*
partial_dir
!=
'/'
&&
(
!
am_server
||
local_server
))
{
int
flags
=
MATCHFLG_NO_PREFIXES
|
MATCHFLG
_DIRECTORY
;
int
rflags
=
FILTRULE_NO_PREFIXES
|
FILTRULE
_DIRECTORY
;
if
(
!
am_sender
||
protocol_version
>=
30
)
flags
|=
MATCHFLG
_PERISHABLE
;
parse_rule
(
&
filter_list
,
partial_dir
,
flags
,
0
);
rflags
|=
FILTRULE
_PERISHABLE
;
parse_rule
(
&
filter_list
,
partial_dir
,
r
flags
,
0
);
}
...
...
exclude.c
View file @
b32d4254
This diff is collapsed.
Click to expand it.
options.c
View file @
b32d4254
...
...
@@ -1409,7 +1409,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
case
OPT_INCLUDE
:
parse_rule
(
&
filter_list
,
poptGetOptArg
(
pc
),
MATCHFLG
_INCLUDE
,
XFLG_OLD_PREFIXES
);
FILTRULE
_INCLUDE
,
XFLG_OLD_PREFIXES
);
break
;
case
OPT_EXCLUDE_FROM
:
...
...
@@ -1432,7 +1432,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
goto
options_rejected
;
}
parse_filter_file
(
&
filter_list
,
arg
,
opt
==
OPT_INCLUDE_FROM
?
MATCHFLG
_INCLUDE
:
0
,
opt
==
OPT_INCLUDE_FROM
?
FILTRULE
_INCLUDE
:
0
,
XFLG_FATAL_ERRORS
|
XFLG_OLD_PREFIXES
);
break
;
...
...
rsync.h
View file @
b32d4254
...
...
@@ -798,36 +798,36 @@ struct map_struct {
int
status
;
/* first errno from read errors */
};
#define
MATCHFLG
_WILD (1<<0)
/* pattern has '*', '[', and/or '?' */
#define
MATCHFLG
_WILD2 (1<<1)
/* pattern has '**' */
#define
MATCHFLG
_WILD2_PREFIX (1<<2)
/* pattern starts with "**" */
#define
MATCHFLG
_WILD3_SUFFIX (1<<3)
/* pattern ends with "***" */
#define
MATCHFLG
_ABS_PATH (1<<4)
/* path-match on absolute path */
#define
MATCHFLG
_INCLUDE (1<<5)
/* this is an include, not an exclude */
#define
MATCHFLG
_DIRECTORY (1<<6)
/* this matches only directories */
#define
MATCHFLG
_WORD_SPLIT (1<<7)
/* split rules on whitespace */
#define
MATCHFLG
_NO_INHERIT (1<<8)
/* don't inherit these rules */
#define
MATCHFLG
_NO_PREFIXES (1<<9)
/* parse no prefixes from patterns */
#define
MATCHFLG
_MERGE_FILE (1<<10)
/* specifies a file to merge */
#define
MATCHFLG
_PERDIR_MERGE (1<<11)
/* merge-file is searched per-dir */
#define
MATCHFLG
_EXCLUDE_SELF (1<<12)
/* merge-file name should be excluded */
#define
MATCHFLG
_FINISH_SETUP (1<<13)
/* per-dir merge file needs setup */
#define
MATCHFLG
_NEGATE (1<<14)
/* rule matches when pattern does not */
#define
MATCHFLG
_CVS_IGNORE (1<<15)
/* rule was -C or :C */
#define
MATCHFLG
_SENDER_SIDE (1<<16)
/* rule applies to the sending side */
#define
MATCHFLG
_RECEIVER_SIDE (1<<17)
/* rule applies to the receiving side */
#define
MATCHFLG_CLEAR_LIST
(1<<18)
/* this item is the "!" token */
#define
MATCHFLG
_PERISHABLE (1<<19)
/* perishable if parent dir goes away */
#define
MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG
_INCLUDE \
|
MATCHFLG_DIRECTORY | MATCHFLG
_SENDER_SIDE \
|
MATCHFLG_NEGATE | MATCHFLG
_RECEIVER_SIDE \
|
MATCHFLG
_PERISHABLE)
#define
FILTRULE
_WILD (1<<0)
/* pattern has '*', '[', and/or '?' */
#define
FILTRULE
_WILD2 (1<<1)
/* pattern has '**' */
#define
FILTRULE
_WILD2_PREFIX (1<<2)
/* pattern starts with "**" */
#define
FILTRULE
_WILD3_SUFFIX (1<<3)
/* pattern ends with "***" */
#define
FILTRULE
_ABS_PATH (1<<4)
/* path-match on absolute path */
#define
FILTRULE
_INCLUDE (1<<5)
/* this is an include, not an exclude */
#define
FILTRULE
_DIRECTORY (1<<6)
/* this matches only directories */
#define
FILTRULE
_WORD_SPLIT (1<<7)
/* split rules on whitespace */
#define
FILTRULE
_NO_INHERIT (1<<8)
/* don't inherit these rules */
#define
FILTRULE
_NO_PREFIXES (1<<9)
/* parse no prefixes from patterns */
#define
FILTRULE
_MERGE_FILE (1<<10)
/* specifies a file to merge */
#define
FILTRULE
_PERDIR_MERGE (1<<11)
/* merge-file is searched per-dir */
#define
FILTRULE
_EXCLUDE_SELF (1<<12)
/* merge-file name should be excluded */
#define
FILTRULE
_FINISH_SETUP (1<<13)
/* per-dir merge file needs setup */
#define
FILTRULE
_NEGATE (1<<14)
/* rule matches when pattern does not */
#define
FILTRULE
_CVS_IGNORE (1<<15)
/* rule was -C or :C */
#define
FILTRULE
_SENDER_SIDE (1<<16)
/* rule applies to the sending side */
#define
FILTRULE
_RECEIVER_SIDE (1<<17)
/* rule applies to the receiving side */
#define
FILTRULE_CLEAR_LIST
(1<<18)
/* this item is the "!" token */
#define
FILTRULE
_PERISHABLE (1<<19)
/* perishable if parent dir goes away */
#define
FILTRULES_FROM_CONTAINER (FILTRULE_ABS_PATH | FILTRULE
_INCLUDE \
|
FILTRULE_DIRECTORY | FILTRULE
_SENDER_SIDE \
|
FILTRULE_NEGATE | FILTRULE
_RECEIVER_SIDE \
|
FILTRULE
_PERISHABLE)
struct
filter_struct
{
struct
filter_struct
*
next
;
char
*
pattern
;
uint32
match_
flags
;
uint32
r
flags
;
union
{
int
slash_cnt
;
struct
filter_list_struct
*
mergelist
;
...
...
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