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
In delete_in_dir(), skip a directory that isn't really a directory on
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
35a64b9
..
1740f7b
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-302,7
+302,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",
-
safe_fname(merge_file)
);
+
merge_file
);
return NULL;
}
} else {
return NULL;
}
} else {
@@
-315,8
+315,7
@@
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",
- safe_fname(fn));
+ rprintf(FERROR, "merge-file name overflows: %s\n", fn);
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
@@
-985,7
+984,7
@@
void parse_filter_file(struct filter_list_struct *listp, const char *fname,
if (verbose > 2) {
rprintf(FINFO, "[%s] parse_filter_file(%s,%x,%x)%s\n",
if (verbose > 2) {
rprintf(FINFO, "[%s] parse_filter_file(%s,%x,%x)%s\n",
- who_am_i(),
safe_fname(fname)
, mflags, xflags,
+ who_am_i(),
fname
, mflags, xflags,
fp ? "" : " [not found]");
}
fp ? "" : " [not found]");
}
@@
-994,7
+993,7
@@
void parse_filter_file(struct filter_list_struct *listp, const char *fname,
rsyserr(FERROR, errno,
"failed to open %sclude file %s",
mflags & MATCHFLG_INCLUDE ? "in" : "ex",
rsyserr(FERROR, errno,
"failed to open %sclude file %s",
mflags & MATCHFLG_INCLUDE ? "in" : "ex",
-
safe_fname(fname)
);
+
fname
);
exit_cleanup(RERR_FILEIO);
}
return;
exit_cleanup(RERR_FILEIO);
}
return;
@@
-1006,8
+1005,10
@@
void parse_filter_file(struct filter_list_struct *listp, const char *fname,
int ch, overflow = 0;
while (1) {
if ((ch = getc(fp)) == EOF) {
int ch, overflow = 0;
while (1) {
if ((ch = getc(fp)) == EOF) {
- if (ferror(fp) && errno == EINTR)
+ if (ferror(fp) && errno == EINTR) {
+ clearerr(fp);
continue;
continue;
+ }
break;
}
if (word_split && isspace(ch))
break;
}
if (word_split && isspace(ch))