Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applying my updated version of Craig Barratt's buffered I/O patch.
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
a12e3b7
..
a459f29
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-40,7
+40,7
@@
static struct exclude_struct *make_exclude(const char *pattern, int include)
char *cp;
int pat_len;
char *cp;
int pat_len;
- ret =
(struct exclude_struct *)malloc(sizeof(*ret)
);
+ ret =
new(struct exclude_struct
);
if (!ret) out_of_memory("make_exclude");
memset(ret, 0, sizeof(*ret));
if (!ret) out_of_memory("make_exclude");
memset(ret, 0, sizeof(*ret));
@@
-57,8
+57,8
@@
static struct exclude_struct *make_exclude(const char *pattern, int include)
if (exclude_path_prefix)
ret->match_flags |= MATCHFLG_ABS_PATH;
if (exclude_path_prefix && *pattern == '/') {
if (exclude_path_prefix)
ret->match_flags |= MATCHFLG_ABS_PATH;
if (exclude_path_prefix && *pattern == '/') {
- ret->pattern =
malloc(strlen(exclude_path_prefix)
-
+ strlen(pattern) + 1);
+ ret->pattern =
new_array(char,
+
strlen(exclude_path_prefix)
+ strlen(pattern) + 1);
if (!ret->pattern) out_of_memory("make_exclude");
sprintf(ret->pattern, "%s%s", exclude_path_prefix, pattern);
}
if (!ret->pattern) out_of_memory("make_exclude");
sprintf(ret->pattern, "%s%s", exclude_path_prefix, pattern);
}
@@
-245,7
+245,7
@@
void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ
if (list)
for (; list[len]; len++) {}
if (list)
for (; list[len]; len++) {}
- list = *listp =
(struct exclude_struct **)Realloc(list,sizeof(struct exclude_struct *)*(len+2)
);
+ list = *listp =
realloc_array(list, struct exclude_struct *, len+2
);
if (!list || !(list[len] = make_exclude(pattern, include)))
out_of_memory("add_exclude");
if (!list || !(list[len] = make_exclude(pattern, include)))
out_of_memory("add_exclude");
@@
-316,7
+316,7
@@
void add_exclude_file(struct exclude_struct ***listp, const char *fname,
void send_exclude_list(int f)
{
int i;
void send_exclude_list(int f)
{
int i;
- extern int
remote
_version;
+ extern int
protocol
_version;
extern int list_only, recurse;
/* This is a complete hack - blame Rusty.
extern int list_only, recurse;
/* This is a complete hack - blame Rusty.
@@
-341,7
+341,7
@@
void send_exclude_list(int f)
l = strlen(pattern);
if (l == 0) continue;
if (exclude_list[i]->include) {
l = strlen(pattern);
if (l == 0) continue;
if (exclude_list[i]->include) {
- if (
remote
_version < 19) {
+ if (
protocol
_version < 19) {
rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
exit_cleanup(RERR_UNSUPPORTED);
}
rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
exit_cleanup(RERR_UNSUPPORTED);
}