Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
893c4cc
)
Use new pathjoin() function.
author
Wayne Davison
<wayned@samba.org>
Tue, 20 Jan 2004 05:09:36 +0000
(
05:09
+0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 20 Jan 2004 05:09:36 +0000
(
05:09
+0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
b325a3b
..
579ffc3
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-72,8
+72,8
@@
static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
-
snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s"
,
- compare_dest,fname);
+
pathjoin(fnamecmpdest, sizeof fnamecmpdest
,
+ compare_dest,
fname);
fname = fnamecmpdest;
}
}
fname = fnamecmpdest;
}
}
@@
-415,7
+415,7
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
if ((statret == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
int saveerrno = errno;
if ((statret == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
int saveerrno = errno;
-
snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,
fname);
+
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest,
fname);
statret = link_stat(fnamecmpbuf,&st);
if (!S_ISREG(st.st_mode))
statret = -1;
statret = link_stat(fnamecmpbuf,&st);
if (!S_ISREG(st.st_mode))
statret = -1;