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
- Use the renamed stdout_format_has_i variable.
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
eb2353c
..
bc180f2
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-298,7
+298,7
@@
static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
strlcpy(to, merge_file, *len_ptr + 1);
merge_file = to;
}
strlcpy(to, merge_file, *len_ptr + 1);
merge_file = to;
}
- if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
+ if (!sanitize_path(fn, merge_file, r, dirbuf_depth
, NULL
)) {
rprintf(FERROR, "merge-file name overflows: %s\n",
merge_file);
return NULL;
rprintf(FERROR, "merge-file name overflows: %s\n",
merge_file);
return NULL;
@@
-861,7
+861,7
@@
static char default_cvsignore[] =
" *.a *.olb *.o *.obj *.so *.exe"
" *.Z *.elc *.ln core"
/* The rest we added to suit ourself. */
" *.a *.olb *.o *.obj *.so *.exe"
" *.Z *.elc *.ln core"
/* The rest we added to suit ourself. */
- " .svn/";
+ " .svn/
.bzr/
";
static void get_cvs_excludes(uint32 mflags)
{
static void get_cvs_excludes(uint32 mflags)
{