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
Improved comments on --owner and --groups, and removed misinformation
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
b325a3b
..
a85567d
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;
@@
-561,8
+561,8
@@
void generate_files(int f, struct file_list *flist, char *local_name)
file = ©
}
file = ©
}
- recv_generator(local_name
? local_name
-
: f_name_to(file,fbuf,sizeof fbuf),
file, i, f);
+ recv_generator(local_name
? local_name : f_name_to(file, fbuf),
+
file, i, f);
}
phase++;
}
phase++;
@@
-578,8
+578,8
@@
void generate_files(int f, struct file_list *flist, char *local_name)
* to catch initial checksum errors */
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
* to catch initial checksum errors */
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
- recv_generator(local_name
? local_name
-
: f_name_to(file,fbuf,sizeof fbuf),
file, i, f);
+ recv_generator(local_name
? local_name : f_name_to(file, fbuf),
+
file, i, f);
}
phase++;
}
phase++;