aboutsummaryrefslogtreecommitdiffstats
path: root/exclude.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-02-07 20:38:56 +0000
committerWayne Davison <wayned@samba.org>2005-02-07 20:38:56 +0000
commita6126d678b4e66b0286d05b50c6245c4c21cfea0 (patch)
tree35a9bb4bd90b7fe3891ccda3e4cf9b8ec8e1e32a /exclude.c
parent4875d6b64dd0ed8d451746cc0cc609cff36192bd (diff)
downloadandroid_external_rsync-a6126d678b4e66b0286d05b50c6245c4c21cfea0.tar.gz
android_external_rsync-a6126d678b4e66b0286d05b50c6245c4c21cfea0.tar.bz2
android_external_rsync-a6126d678b4e66b0286d05b50c6245c4c21cfea0.zip
Added missing call to safe_fname().
Diffstat (limited to 'exclude.c')
-rw-r--r--exclude.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/exclude.c b/exclude.c
index d25b1b15..6cc8840f 100644
--- 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",
- merge_file);
+ safe_fname(merge_file));
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) {
- 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);