X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/968c8030cf0fa0e057b8dbe7233945a3aad10ede..1a9ec1fd1c144e5f578ee3746bc1ea4a3c73a7cc:/generator.c diff --git a/generator.c b/generator.c index fd2ac596..453c6e07 100644 --- a/generator.c +++ b/generator.c @@ -30,6 +30,9 @@ extern int preserve_links; 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; @@ -43,25 +46,21 @@ extern int link_dest; /* choose whether to skip a particular file */ -static int skip_file(char *fname, - struct file_struct *file, STRUCT_STAT *st) +static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st) { if (st->st_size != file->length) { 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)) + && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) 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; } @@ -73,17 +72,14 @@ static int skip_file(char *fname, 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); - if (protocol_version < 21) { - return (memcmp(sum,file->sum,2) == 0); - } else { - return (memcmp(sum,file->sum,MD4_SUM_LENGTH) == 0); - } + return memcmp(sum, file->u.sum, protocol_version < 21 ? 2 + : MD4_SUM_LENGTH) == 0; } if (size_only) { @@ -99,14 +95,13 @@ static int skip_file(char *fname, /* - * NULL sum_struct means we have no checksums + * NULL sum_struct means we have no checksums */ - void write_sum_head(int f, struct sum_struct *sum) { static struct sum_struct null_sum; - if (sum == (struct sum_struct *)NULL) + if (sum == NULL) sum = &null_sum; write_int(f, sum->count); @@ -136,8 +131,9 @@ void write_sum_head(int f, struct sum_struct *sum) static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) { - extern int block_size; - int blength, s2length, b; + extern unsigned int block_size; + unsigned int blength; + int s2length; uint32 c; uint64 l; @@ -166,7 +162,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) } else if (csum_length == SUM_LENGTH) { s2length = SUM_LENGTH; } else { - b = BLOCKSUM_BIAS; + int b = BLOCKSUM_BIAS; l = len; while (l >>= 1) { b += 2; @@ -191,10 +187,9 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) sum->remainder = (len % blength); if (sum->count && verbose > 2) { - rprintf(FINFO, "count=%ld rem=%ld blength=%ld s2length=%ld flength=%.0f\n", - (long) sum->count, (long) sum->remainder, - (long) sum->blength, (long) sum->s2length, - (double) sum->flength); + rprintf(FINFO, "count=%.0f rem=%u blength=%u s2length=%d flength=%.0f\n", + (double)sum->count, sum->remainder, sum->blength, + sum->s2length, (double)sum->flength); } } @@ -226,7 +221,7 @@ static BOOL disable_deltas_p(void) * * 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; @@ -237,7 +232,7 @@ static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out) write_sum_head(f_out, &sum); for (i = 0; i < sum.count; i++) { - int n1 = MIN(len, sum.blength); + unsigned int n1 = MIN(len, sum.blength); char *map = map_ptr(buf, offset, n1); uint32 sum1 = get_checksum1(map, n1); char sum2[SUM_LENGTH]; @@ -246,8 +241,9 @@ static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out) if (verbose > 3) { rprintf(FINFO, - "chunk[%ld] offset=%.0f len=%d sum1=%08lx\n", - (long)i,(double)offset,n1,(unsigned long)sum1); + "chunk[%.0f] offset=%.0f len=%u sum1=%08lx\n", + (double)i, (double)offset, n1, + (unsigned long)sum1); } write_int(f_out, sum1); write_buf(f_out, sum2, sum.s2length); @@ -266,22 +262,21 @@ static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out) * @note This comment was added later by mbp who was trying to work it * out. It might be wrong. **/ -void recv_generator(char *fname, struct file_list *flist, int i, int f_out) +void recv_generator(char *fname, struct file_struct *file, int i, int f_out) { int fd; STRUCT_STAT st; 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 (list_only) return; + if (list_only) + return; if (verbose > 2) rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i); @@ -300,7 +295,8 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) /* 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)) { @@ -341,10 +337,10 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) 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; } @@ -355,7 +351,7 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) /* 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; } @@ -365,13 +361,13 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) * 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 @@ -382,12 +378,12 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) 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 { @@ -402,13 +398,8 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) } #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); @@ -417,10 +408,10 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) 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; @@ -443,6 +434,8 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) } 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); @@ -460,6 +453,8 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) } /* 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; @@ -501,6 +496,8 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) 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; @@ -511,8 +508,10 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out) else mapbuf = NULL; - if (verbose > 3) - rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); + if (verbose > 3) { + rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp, + (double)st.st_size); + } if (verbose > 2) rprintf(FINFO, "generating and sending sums for %d\n", i); @@ -525,16 +524,16 @@ void recv_generator(char *fname, struct file_list *flist, 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; 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, @@ -550,22 +549,23 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; - mode_t saved_mode = file->mode; - if (!file->basename) continue; + struct file_struct copy; + if (!file->basename) + continue; /* we need to ensure that any directories we create have writeable permissions initially so that we can create the files within them. This is then fixed after the files are transferred */ - if (!am_root && S_ISDIR(file->mode)) { - file->mode |= S_IWUSR; /* user write */ + if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) { + copy = *file; /* XXX: Could this be causing a problem on SCO? Perhaps their * handling of permissions is strange? */ + copy.mode |= S_IWUSR; /* user write */ + file = © } - recv_generator(local_name? local_name - : f_name_to(file,fbuf,sizeof fbuf), flist, i, f); - - file->mode = saved_mode; + recv_generator(local_name ? local_name : f_name_to(file, fbuf), + file, i, f); } phase++; @@ -579,10 +579,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 */ - for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) { + 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), flist, i, f); + recv_generator(local_name ? local_name : f_name_to(file, fbuf), + file, i, f); } phase++; @@ -590,4 +590,19 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) 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"); }