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
Added missing call to safe_fname().
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
6ea9767
..
6cc8840
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-278,7
+278,7
@@
static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
}
if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
rprintf(FERROR, "merge-file name overflows: %s\n",
}
if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
rprintf(FERROR, "merge-file name overflows: %s\n",
-
merge_file
);
+
safe_fname(merge_file)
);
return NULL;
}
} else {
return NULL;
}
} else {
@@
-291,7
+291,8
@@
static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
goto done;
if (dirbuf_len + fn_len >= MAXPATHLEN) {
goto done;
if (dirbuf_len + fn_len >= MAXPATHLEN) {
- rprintf(FERROR, "merge-file name overflows: %s\n", fn);
+ rprintf(FERROR, "merge-file name overflows: %s\n",
+ safe_fname(fn));
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
@@
-935,15
+936,15
@@
void parse_filter_file(struct filter_list_struct *listp, const char *fname,
fclose(fp);
}
fclose(fp);
}
-/* If the "
sending" flag is > 0
, the prefix is made compatible with the
+/* If the "
for_xfer" flag is set
, the prefix is made compatible with the
* current protocol_version (if possible) or a NULL is returned (if not
* possible). */
* current protocol_version (if possible) or a NULL is returned (if not
* possible). */
-char *get_rule_prefix(int match_flags, const char *pat, int
sending
,
+char *get_rule_prefix(int match_flags, const char *pat, int
for_xfer
,
unsigned int *plen_ptr)
{
static char buf[MAX_RULE_PREFIX+1];
char *op = buf;
unsigned int *plen_ptr)
{
static char buf[MAX_RULE_PREFIX+1];
char *op = buf;
- int legal_len =
sending
&& protocol_version < 29 ? 1 : MAX_RULE_PREFIX;
+ int legal_len =
for_xfer
&& protocol_version < 29 ? 1 : MAX_RULE_PREFIX;
if (match_flags & MATCHFLG_PERDIR_MERGE) {
if (legal_len == 1)
if (match_flags & MATCHFLG_PERDIR_MERGE) {
if (legal_len == 1)
@@
-973,15
+974,13
@@
char *get_rule_prefix(int match_flags, const char *pat, int sending,
}
if (match_flags & MATCHFLG_EXCLUDE_SELF)
*op++ = 'e';
}
if (match_flags & MATCHFLG_EXCLUDE_SELF)
*op++ = 'e';
- if (op - buf > legal_len)
- return NULL;
if (legal_len)
*op++ = ' ';
if (legal_len)
*op++ = ' ';
+ if (op - buf > legal_len)
+ return NULL;
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;
- if (op - buf > MAX_RULE_PREFIX)
- overflow("get_rule_prefix");
return buf;
}
return buf;
}
@@
-1022,7
+1021,9
@@
static void send_rules(int f_out, struct filter_list_struct *flp)
/* This is only called by the client. */
void send_filter_list(int f_out)
{
/* This is only called by the client. */
void send_filter_list(int f_out)
{
- if (local_server || (am_sender && (!delete_mode || delete_excluded)))
+ int receiver_wants_list = delete_mode && !delete_excluded;
+
+ if (local_server || (am_sender && !receiver_wants_list))
f_out = -1;
if (cvs_exclude && am_sender) {
if (protocol_version >= 29)
f_out = -1;
if (cvs_exclude && am_sender) {
if (protocol_version >= 29)
@@
-1054,8
+1055,9
@@
void recv_filter_list(int f_in)
char line[MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
unsigned int len;
char line[MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
unsigned int len;
+ int receiver_wants_list = delete_mode && !delete_excluded;
- if (!local_server && (am_sender ||
(delete_mode && !delete_excluded)
)) {
+ if (!local_server && (am_sender ||
receiver_wants_list
)) {
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
overflow("recv_rules");
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
overflow("recv_rules");