}
if (link_dest) {
if (preserve_perms
- && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+ && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 0;
if (am_root && preserve_uid && st->st_uid != file->uid)
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);
- return memcmp(sum, file->sum, protocol_version < 21? 2
+ return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
: MD4_SUM_LENGTH) == 0;
}
{
static struct sum_struct null_sum;
- if (sum == (struct sum_struct *)NULL)
+ if (sum == NULL)
sum = &null_sum;
write_int(f, sum->count);
/* if the file exists already and we aren't perserving
* permissions then act as though the remote end sent
* us the file permissions we already have */
- file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
+ file->mode = (file->mode & ~CHMOD_BITS)
+ | (st.st_mode & CHMOD_BITS);
}
if (S_ISDIR(file->mode)) {
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",
- full_fname(fname), file->link);
+ full_fname(fname), file->u.link);
}
return;
}
/* 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;
}
* 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",
- full_fname(fname), file->link, strerror(errno));
+ full_fname(fname), file->u.link, strerror(errno));
} 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
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
- (DEV64_T)st.st_rdev != file->rdev) {
+ st.st_rdev != file->u.rdev) {
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 {
}
#endif
- if (preserve_hard_links && check_hard_link(file)) {
- if (verbose > 1) {
- rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",
- f_name(file));
- }
+ if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
return;
- }
if (!S_ISREG(file->mode)) {
rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
fnamecmp = fname;
- if ((statret == -1) && (compare_dest != NULL)) {
+ 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;
}
if (statret == -1) {
+ if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ return;
if (errno == ENOENT) {
write_int(f_out,i);
if (!dry_run) write_sum_head(f_out, NULL);
}
/* now pretend the file didn't exist */
+ if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ return;
write_int(f_out,i);
if (!dry_run) write_sum_head(f_out, NULL);
return;
rprintf(FERROR, "failed to open %s, continuing: %s\n",
full_fname(fnamecmp), strerror(errno));
/* pretend the file didn't exist */
+ if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ return;
write_int(f_out,i);
write_sum_head(f_out, NULL);
return;
}
-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;
char fbuf[MAXPATHLEN];
- if (verbose > 2)
- rprintf(FINFO,"generator starting pid=%d count=%d\n",
- (int)getpid(),flist->count);
+ if (verbose > 2) {
+ rprintf(FINFO, "generator starting pid=%ld count=%d\n",
+ (long)getpid(), flist->count);
+ }
if (verbose >= 2) {
rprintf(FINFO,
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++;
/* 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];
- 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++;
rprintf(FINFO,"generate_files phase=%d\n",phase);
write_int(f,-1);
+
+ if (preserve_hard_links)
+ do_hard_links();
+
+ /* now we need to fix any directory permissions that were
+ * modified during the transfer */
+ for (i = 0; i < flist->count; i++) {
+ struct file_struct *file = flist->files[i];
+ if (!file->basename || !S_ISDIR(file->mode)) continue;
+ recv_generator(local_name ? local_name : f_name(file),
+ file, i, -1);
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO,"generate_files finished\n");
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff