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 new f_name_to() calling syntax.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
7c81874
..
a85567d
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-72,13
+72,13
@@
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;
}
}
file_checksum(fname,sum,st->st_size);
fname = fnamecmpdest;
}
}
file_checksum(fname,sum,st->st_size);
- return memcmp(sum, file->
sum, protocol_version < 21
? 2
+ return memcmp(sum, file->
u.sum, protocol_version < 21
? 2
: MD4_SUM_LENGTH) == 0;
}
: MD4_SUM_LENGTH) == 0;
}
@@
-336,10
+336,10
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
int l;
extern int safe_symlinks;
int l;
extern int safe_symlinks;
- if (safe_symlinks && unsafe_symlink(file->link, fname)) {
+ if (safe_symlinks && unsafe_symlink(file->
u.
link, fname)) {
if (verbose) {
rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
if (verbose) {
rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname), file->link);
+ full_fname(fname), file->
u.
link);
}
return;
}
}
return;
}
@@
-350,7
+350,7
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
/* A link already pointing to the
* right place -- no further action
* required. */
/* A link already pointing to the
* right place -- no further action
* required. */
- if (strcmp(lnk,file->link) == 0) {
+ if (strcmp(lnk,file->
u.
link) == 0) {
set_perms(fname,file,&st,1);
return;
}
set_perms(fname,file,&st,1);
return;
}
@@
-360,13
+360,13
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
* in place. */
delete_file(fname);
}
* in place. */
delete_file(fname);
}
- if (do_symlink(file->link,fname) != 0) {
+ if (do_symlink(file->
u.
link,fname) != 0) {
rprintf(FERROR, "symlink %s -> \"%s\" failed: %s\n",
rprintf(FERROR, "symlink %s -> \"%s\" failed: %s\n",
- full_fname(fname), file->link, strerror(errno));
+ full_fname(fname), file->
u.
link, strerror(errno));
} else {
set_perms(fname,file,NULL,0);
if (verbose) {
} else {
set_perms(fname,file,NULL,0);
if (verbose) {
- rprintf(FINFO,"%s -> %s\n", fname,file->link);
+ rprintf(FINFO,"%s -> %s\n", fname,file->
u.
link);
}
}
#endif
}
}
#endif
@@
-377,12
+377,12
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
- (DEV64_T)st.st_rdev != file->rdev) {
+ (DEV64_T)st.st_rdev != file->
u.
rdev) {
delete_file(fname);
if (verbose > 2)
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
delete_file(fname);
if (verbose > 2)
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname,(int)file->mode,(int)file->rdev);
- if (do_mknod(fname,file->mode,file->rdev) != 0) {
+ fname,(int)file->mode,(int)file->
u.
rdev);
+ if (do_mknod(fname,file->mode,file->
u.
rdev) != 0) {
rprintf(FERROR, "mknod %s failed: %s\n",
full_fname(fname), strerror(errno));
} else {
rprintf(FERROR, "mknod %s failed: %s\n",
full_fname(fname), strerror(errno));
} else {
@@
-397,7
+397,7
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
}
#endif
}
#endif
- if (preserve_hard_links &&
check_hard_link(file)
) {
+ if (preserve_hard_links &&
file->link_u.links && file->F_HEAD != file
) {
if (verbose > 1) {
rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",
f_name(file));
if (verbose > 1) {
rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",
f_name(file));
@@
-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;
@@
-522,7
+522,7
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
}
}
-void generate_files(int f,
struct file_list *flist,char *local_name,int f_recv
)
+void generate_files(int f,
struct file_list *flist, char *local_name
)
{
int i;
int phase=0;
{
int i;
int phase=0;
@@
-561,8
+561,8
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
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++;
@@
-576,10
+576,10
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
/* files can cycle through the system more than once
* to catch initial checksum errors */
/* files can cycle through the system more than once
* to catch initial checksum errors */
- while ((i =
read_int(f_recv
)) != -1) {
+ while ((i =
get_redo_num(
)) != -1) {
struct file_struct *file = flist->files[i];
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++;