Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc267e0
)
Change ex_len to pre_len in add_rule().
author
Wayne Davison
<wayned@samba.org>
Sat, 22 Mar 2008 19:21:41 +0000
(12:21 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sat, 22 Mar 2008 19:21:41 +0000
(12:21 -0700)
exclude.c
patch
|
blob
|
blame
|
history
diff --git
a/exclude.c
b/exclude.c
index
422a824
..
e796b2f
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-119,7
+119,7
@@
static void add_rule(struct filter_list_struct *listp, const char *pat,
{
struct filter_struct *ret;
const char *cp;
{
struct filter_struct *ret;
const char *cp;
- unsigned int
ex
_len;
+ unsigned int
pre
_len;
if (verbose > 2) {
rprintf(FINFO, "[%s] add_rule(%s%.*s%s)%s\n",
if (verbose > 2) {
rprintf(FINFO, "[%s] add_rule(%s%.*s%s)%s\n",
@@
-150,17
+150,17
@@
static void add_rule(struct filter_list_struct *listp, const char *pat,
|| (xflags & XFLG_ABS_IF_SLASH && strchr(pat, '/') != NULL))) {
mflags |= MATCHFLG_ABS_PATH;
if (*pat == '/')
|| (xflags & XFLG_ABS_IF_SLASH && strchr(pat, '/') != NULL))) {
mflags |= MATCHFLG_ABS_PATH;
if (*pat == '/')
-
ex
_len = dirbuf_len - module_dirlen - 1;
+
pre
_len = dirbuf_len - module_dirlen - 1;
else
else
-
ex
_len = 0;
+
pre
_len = 0;
} else
} else
-
ex
_len = 0;
- if (!(ret->pattern = new_array(char,
ex
_len + pat_len + 1)))
+
pre
_len = 0;
+ if (!(ret->pattern = new_array(char,
pre
_len + pat_len + 1)))
out_of_memory("add_rule");
out_of_memory("add_rule");
- if (
ex
_len)
- memcpy(ret->pattern, dirbuf + module_dirlen,
ex
_len);
- strlcpy(ret->pattern +
ex
_len, pat, pat_len + 1);
- pat_len +=
ex
_len;
+ if (
pre
_len)
+ memcpy(ret->pattern, dirbuf + module_dirlen,
pre
_len);
+ strlcpy(ret->pattern +
pre
_len, pat, pat_len + 1);
+ pat_len +=
pre
_len;
if (strpbrk(ret->pattern, "*[?")) {
mflags |= MATCHFLG_WILD;
if (strpbrk(ret->pattern, "*[?")) {
mflags |= MATCHFLG_WILD;