extern int am_root;
extern int preserve_devices;
extern int preserve_hard_links;
+extern int preserve_perms;
+extern int preserve_uid;
+extern int preserve_gid;
extern int update_only;
extern int opt_ignore_existing;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern int io_timeout;
-extern int remote_version;
+extern int protocol_version;
extern int always_checksum;
-extern int modify_window;
extern char *compare_dest;
extern int link_dest;
return 0;
}
if (link_dest) {
- extern int preserve_perms;
- extern int preserve_uid;
- extern int preserve_gid;
-
- if(preserve_perms
- && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+ if (preserve_perms
+ && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
return 0;
- if (preserve_uid && st->st_uid != file->uid)
+ if (am_root && preserve_uid && st->st_uid != file->uid)
return 0;
- if (preserve_gid && st->st_gid != file->gid)
+ if (preserve_gid && file->gid != GID_NONE
+ && st->st_gid != file->gid)
return 0;
}
}
}
file_checksum(fname,sum,st->st_size);
- if (remote_version < 21) {
+ if (protocol_version < 21) {
return (memcmp(sum,file->sum,2) == 0);
} else {
return (memcmp(sum,file->sum,MD4_SUM_LENGTH) == 0);
write_int(f, sum->count);
write_int(f, sum->blength);
- if (remote_version >= 27)
+ if (protocol_version >= 27)
write_int(f, sum->s2length);
write_int(f, sum->remainder);
}
* This might be made one of several selectable heuristics.
*/
-static void sum_sizes_sqroot_baarda(struct sum_struct *sum, uint64 len)
+static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
{
extern int block_size;
int blength, s2length, b;
blength = 0;
do {
blength |= c;
- if (len < (uint64)(blength * blength))
+ if (len < (uint64)blength * blength)
blength &= ~c;
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
}
- if (remote_version < 27) {
+ if (protocol_version < 27) {
s2length = csum_length;
} else if (csum_length == SUM_LENGTH) {
s2length = SUM_LENGTH;
*
* Generate approximately one checksum every block_len bytes.
*/
-static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out)
+static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out)
{
size_t i;
struct sum_struct sum;
OFF_T offset = 0;
- sum_sizes_sqroot_baarda(&sum, len);
+ sum_sizes_sqroot(&sum, len);
write_sum_head(f_out, &sum);
if (verbose > 3) {
rprintf(FINFO,
- "chunk[%d] offset=%.0f len=%d sum1=%08lx\n",
- i, (double) offset, n1, (unsigned long) sum1);
+ "chunk[%ld] offset=%.0f len=%d sum1=%08lx\n",
+ (long)i,(double)offset,n1,(unsigned long)sum1);
}
write_int(f_out, sum1);
write_buf(f_out, sum2, sum.s2length);
{
int fd;
STRUCT_STAT st;
- struct map_struct *buf;
+ struct map_struct *mapbuf;
int statret;
struct file_struct *file = flist->files[i];
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
extern char *compare_dest;
extern int list_only;
- extern int preserve_perms;
extern int only_existing;
extern int orig_umask;
if (dry_run) return; /* XXXX -- might cause inaccuracies?? -- mbp */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
- rprintf(FERROR, RSYNC_NAME
- ": recv_generator: unlink \"%s\" to make room for directory: %s\n",
- fname,strerror(errno));
+ rprintf(FERROR,
+ "recv_generator: unlink %s to make room for directory: %s\n",
+ full_fname(fname), strerror(errno));
return;
}
statret = -1;
if (!(relative_paths && errno==ENOENT &&
create_directory_path(fname, orig_umask)==0 &&
do_mkdir(fname,file->mode)==0)) {
- rprintf(FERROR, RSYNC_NAME ": recv_generator: mkdir \"%s\": %s (2)\n",
- fname,strerror(errno));
+ rprintf(FERROR, "recv_generator: mkdir %s failed: %s\n",
+ full_fname(fname), strerror(errno));
}
}
/* f_out is set to -1 when doing final directory
if (safe_symlinks && unsafe_symlink(file->link, fname)) {
if (verbose) {
- rprintf(FINFO,"ignoring unsafe symlink \"%s\" -> \"%s\"\n",
- fname,file->link);
+ rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
+ full_fname(fname), file->link);
}
return;
}
delete_file(fname);
}
if (do_symlink(file->link,fname) != 0) {
- rprintf(FERROR,RSYNC_NAME": symlink \"%s\" -> \"%s\": %s\n",
- fname,file->link,strerror(errno));
+ rprintf(FERROR, "symlink %s -> \"%s\" failed: %s\n",
+ full_fname(fname), file->link, strerror(errno));
} else {
set_perms(fname,file,NULL,0);
if (verbose) {
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
- st.st_rdev != file->rdev) {
+ (DEV64_T)st.st_rdev != file->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) {
- rprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR, "mknod %s failed: %s\n",
+ full_fname(fname), strerror(errno));
} else {
set_perms(fname,file,NULL,0);
if (verbose)
#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 (verbose > 1) {
+ rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",
+ f_name(file));
+ }
return;
}
#if HAVE_LINK
else if (link_dest && !dry_run) {
if (do_link(fnamecmpbuf, fname) != 0) {
- if (verbose > 0)
+ if (verbose > 0) {
rprintf(FINFO,"link %s => %s : %s\n",
- fnamecmpbuf,
- fname,
+ fnamecmpbuf, fname,
strerror(errno));
+ }
}
fnamecmp = fnamecmpbuf;
}
if (errno == ENOENT) {
write_int(f_out,i);
if (!dry_run) write_sum_head(f_out, NULL);
- } else {
- if (verbose > 1)
- rprintf(FERROR, RSYNC_NAME
- ": recv_generator failed to open \"%s\": %s\n",
- fname, strerror(errno));
+ } else if (verbose > 1) {
+ rprintf(FERROR,
+ "recv_generator: failed to open %s: %s\n",
+ full_fname(fname), strerror(errno));
}
return;
}
fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
- rprintf(FERROR,RSYNC_NAME": failed to open \"%s\", continuing : %s\n",fnamecmp,strerror(errno));
+ rprintf(FERROR, "failed to open %s, continuing: %s\n",
+ full_fname(fnamecmp), strerror(errno));
/* pretend the file didn't exist */
write_int(f_out,i);
write_sum_head(f_out, NULL);
return;
}
- if (st.st_size > 0) {
- buf = map_file(fd,st.st_size);
- } else {
- buf = NULL;
- }
+ if (st.st_size > 0)
+ mapbuf = map_file(fd,st.st_size);
+ else
+ mapbuf = NULL;
if (verbose > 3)
rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
- generate_and_send_sums(buf, st.st_size, f_out);
+ generate_and_send_sums(mapbuf, st.st_size, f_out);
close(fd);
- if (buf) unmap_file(buf);
+ if (mapbuf) unmap_file(mapbuf);
}
{
int i;
int phase=0;
+ char fbuf[MAXPATHLEN];
if (verbose > 2)
rprintf(FINFO,"generator starting pid=%d count=%d\n",
* handling of permissions is strange? */
}
- recv_generator(local_name?local_name:f_name(file), flist,i,f);
+ recv_generator(local_name? local_name
+ : f_name_to(file,fbuf,sizeof fbuf), flist, i, f);
file->mode = saved_mode;
}
/* files can cycle through the system more than once
* to catch initial checksum errors */
- for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
+ for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) {
struct file_struct *file = flist->files[i];
- recv_generator(local_name?local_name:f_name(file), flist,i,f);
+ recv_generator(local_name? local_name
+ : f_name_to(file,fbuf,sizeof fbuf), flist, i, f);
}
phase++;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff