X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3915fd7583799712e7956f8034ace529f6d87da0..b4afd23c308ed2ef7df894cfb8be532fee521ad5:/generator.c diff --git a/generator.c b/generator.c index 453c6e07..33fcf2ab 100644 --- a/generator.c +++ b/generator.c @@ -26,6 +26,7 @@ extern int verbose; extern int dry_run; extern int relative_paths; +extern int keep_dirlinks; extern int preserve_links; extern int am_root; extern int preserve_devices; @@ -43,14 +44,23 @@ extern int protocol_version; extern int always_checksum; extern char *compare_dest; extern int link_dest; +extern int whole_file; +extern int local_server; +extern int list_only; +extern int read_batch; +extern int only_existing; +extern int orig_umask; +extern int safe_symlinks; +extern unsigned int block_size; + +extern struct exclude_list_struct server_exclude_list; /* choose whether to skip a particular file */ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st) { - if (st->st_size != file->length) { + if (st->st_size != file->length) return 0; - } if (link_dest) { if (preserve_perms && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) @@ -82,15 +92,13 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st) : MD4_SUM_LENGTH) == 0; } - if (size_only) { + if (size_only) return 1; - } - if (ignore_times) { + if (ignore_times) return 0; - } - return (cmp_modtime(st->st_mtime,file->modtime) == 0); + return cmp_modtime(st->st_mtime, file->modtime) == 0; } @@ -111,11 +119,11 @@ void write_sum_head(int f, struct sum_struct *sum) write_int(f, sum->remainder); } -/* +/* * set (initialize) the size entries in the per-file sum_struct - * calulating dynamic block ans checksum sizes. + * calculating dynamic block and checksum sizes. * - * This is only called from generate_and_send_sums() but is a seperate + * This is only called from generate_and_send_sums() but is a separate * function to encapsulate the logic. * * The block size is a rounded square root of file length. @@ -131,7 +139,6 @@ void write_sum_head(int f, struct sum_struct *sum) static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) { - extern unsigned int block_size; unsigned int blength; int s2length; uint32 c; @@ -155,6 +162,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) c >>= 1; } while (c >= 8); /* round to multiple of 8 */ blength = MAX(blength, BLOCK_SIZE); + blength = MIN(blength, MAX_MAP_SIZE); } if (protocol_version < 27) { @@ -193,47 +201,31 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) } } -/** - * Perhaps we want to just send an empty checksum set for this file, - * which will force the whole thing to be literally transferred. - * - * When do we do this? If the user's explicitly said they - * want the whole thing, or if { they haven't explicitly - * requested a delta, and it's local but not batch mode.} - * - * Whew. */ -static BOOL disable_deltas_p(void) -{ - extern int whole_file; - extern int local_server; - extern int write_batch; - - if (whole_file > 0) - return True; - if (whole_file == 0 || write_batch) - return False; - return local_server; -} - /* * Generate and send a stream of signatures/checksums that describe a buffer * * Generate approximately one checksum every block_len bytes. */ -static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out) +static void generate_and_send_sums(int fd, OFF_T len, int f_out) { size_t i; + struct map_struct *mapbuf; struct sum_struct sum; OFF_T offset = 0; sum_sizes_sqroot(&sum, len); + if (len > 0) + mapbuf = map_file(fd, len, sum.blength); + else + mapbuf = NULL; + write_sum_head(f_out, &sum); for (i = 0; i < sum.count; i++) { unsigned int n1 = MIN(len, sum.blength); - char *map = map_ptr(buf, offset, n1); + char *map = map_ptr(mapbuf, offset, n1); uint32 sum1 = get_checksum1(map, n1); char sum2[SUM_LENGTH]; @@ -250,30 +242,29 @@ static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out len -= n1; offset += n1; } + + if (mapbuf) + unmap_file(mapbuf); } -/** +/* * Acts on file number @p i from @p flist, whose name is @p fname. * * First fixes up permissions, then generates checksums for the file. * * @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_struct *file, int i, int f_out) + */ +static 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; char *fnamecmp; char fnamecmpbuf[MAXPATHLEN]; - extern char *compare_dest; - extern int list_only; - extern int only_existing; - extern int orig_umask; if (list_only) return; @@ -281,17 +272,27 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) if (verbose > 2) rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i); - statret = link_stat(fname,&st); + if (server_exclude_list.head + && check_exclude(&server_exclude_list, fname, + S_ISDIR(file->mode)) < 0) { + if (verbose) { + rprintf(FINFO, "skipping server-excluded file \"%s\"\n", + fname); + } + return; + } + + statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode)); if (only_existing && statret == -1 && errno == ENOENT) { /* we only want to update existing files */ - if (verbose > 1) rprintf(FINFO, "not creating new file \"%s\"\n",fname); + if (verbose > 1) + rprintf(FINFO, "not creating new file \"%s\"\n", fname); return; } - if (statret == 0 && - !preserve_perms && - (S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) { + if (statret == 0 && !preserve_perms + && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) { /* 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 */ @@ -306,27 +307,30 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) * we need to delete it. If it doesn't exist, then * recursively create it. */ - if (dry_run) return; /* XXXX -- might cause inaccuracies?? -- mbp */ + if (dry_run) + return; /* TODO: causes inaccuracies -- fix */ if (statret == 0 && !S_ISDIR(st.st_mode)) { if (robust_unlink(fname) != 0) { - rprintf(FERROR, - "recv_generator: unlink %s to make room for directory: %s\n", - full_fname(fname), strerror(errno)); + rsyserr(FERROR, errno, + "recv_generator: unlink %s to make room for directory", + full_fname(fname)); return; } statret = -1; } if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { - if (!(relative_paths && errno==ENOENT && - create_directory_path(fname, orig_umask)==0 && - do_mkdir(fname,file->mode)==0)) { - rprintf(FERROR, "recv_generator: mkdir %s failed: %s\n", - full_fname(fname), strerror(errno)); + if (!(relative_paths && errno == ENOENT + && create_directory_path(fname, orig_umask) == 0 + && do_mkdir(fname, file->mode) == 0)) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(fname)); } } - /* f_out is set to -1 when doing final directory - permission and modification time repair */ - if (set_perms(fname,file,NULL,0) && verbose && (f_out != -1)) + /* f_out is set to -1 when doing final directory-permission + * and modification-time repair. */ + if (set_perms(fname, file, statret ? NULL : &st, 0) + && verbose && f_out != -1) rprintf(FINFO,"%s/\n",fname); return; } @@ -335,7 +339,6 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) #if SUPPORT_LINKS char lnk[MAXPATHLEN]; int l; - extern int safe_symlinks; if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { @@ -352,7 +355,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) * right place -- no further action * required. */ if (strcmp(lnk,file->u.link) == 0) { - set_perms(fname,file,&st,1); + set_perms(fname, file, &st, + PERMS_REPORT); return; } } @@ -362,8 +366,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) delete_file(fname); } if (do_symlink(file->u.link,fname) != 0) { - rprintf(FERROR, "symlink %s -> \"%s\" failed: %s\n", - full_fname(fname), file->u.link, strerror(errno)); + rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", + full_fname(fname), file->u.link); } else { set_perms(fname,file,NULL,0); if (verbose) { @@ -380,19 +384,20 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) st.st_mode != file->mode || st.st_rdev != file->u.rdev) { delete_file(fname); - if (verbose > 2) + if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", 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)); + rsyserr(FERROR, errno, "mknod %s failed", + full_fname(fname)); } else { set_perms(fname,file,NULL,0); if (verbose) rprintf(FINFO,"%s\n",fname); } } else { - set_perms(fname,file,&st,1); + set_perms(fname, file, &st, PERMS_REPORT); } return; } @@ -412,7 +417,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) /* try the file at compare_dest instead */ int saveerrno = errno; pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname); - statret = link_stat(fnamecmpbuf,&st); + statret = link_stat(fnamecmpbuf, &st, 0); if (!S_ISREG(st.st_mode)) statret = -1; if (statret == -1) @@ -421,9 +426,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) else if (link_dest && !dry_run) { if (do_link(fnamecmpbuf, fname) != 0) { if (verbose > 0) { - rprintf(FINFO,"link %s => %s : %s\n", - fnamecmpbuf, fname, - strerror(errno)); + rsyserr(FINFO, errno, "link %s => %s", + fnamecmpbuf, fname); } } fnamecmp = fnamecmpbuf; @@ -438,11 +442,12 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) return; if (errno == ENOENT) { write_int(f_out,i); - if (!dry_run) write_sum_head(f_out, NULL); + if (!dry_run && !read_batch) + write_sum_head(f_out, NULL); } else if (verbose > 1) { - rprintf(FERROR, - "recv_generator: failed to open %s: %s\n", - full_fname(fname), strerror(errno)); + rsyserr(FERROR, errno, + "recv_generator: failed to open %s", + full_fname(fname)); } return; } @@ -456,7 +461,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) 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); + if (!dry_run && !read_batch) + write_sum_head(f_out, NULL); return; } @@ -466,7 +472,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) return; } - if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { + if (update_only && fnamecmp == fname + && cmp_modtime(st.st_mtime, file->modtime) > 0) { if (verbose > 1) rprintf(FINFO,"%s is newer\n",fname); return; @@ -474,16 +481,16 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) if (skip_file(fname, file, &st)) { if (fnamecmp == fname) - set_perms(fname,file,&st,1); + set_perms(fname, file, &st, PERMS_REPORT); return; } - if (dry_run) { + if (dry_run || read_batch) { write_int(f_out,i); return; } - if (disable_deltas_p()) { + if (whole_file > 0) { write_int(f_out,i); write_sum_head(f_out, NULL); return; @@ -493,8 +500,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) fd = do_open(fnamecmp, O_RDONLY, 0); if (fd == -1) { - rprintf(FERROR, "failed to open %s, continuing: %s\n", - full_fname(fnamecmp), strerror(errno)); + rsyserr(FERROR, errno, "failed to open %s, continuing", + full_fname(fnamecmp)); /* pretend the file didn't exist */ if (preserve_hard_links && hard_link_check(file, HL_SKIP)) return; @@ -503,11 +510,6 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) return; } - 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); @@ -517,17 +519,16 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) rprintf(FINFO, "generating and sending sums for %d\n", i); write_int(f_out,i); - generate_and_send_sums(mapbuf, st.st_size, f_out); + generate_and_send_sums(fd, st.st_size, f_out); close(fd); - if (mapbuf) unmap_file(mapbuf); } -void generate_files(int f, struct file_list *flist, char *local_name) +void generate_files(int f_out, struct file_list *flist, char *local_name) { int i; - int phase=0; + int phase = 0; char fbuf[MAXPATHLEN]; if (verbose > 2) { @@ -537,7 +538,7 @@ void generate_files(int f, struct file_list *flist, char *local_name) if (verbose >= 2) { rprintf(FINFO, - disable_deltas_p() + whole_file > 0 ? "delta-transmission disabled for local transfer or --whole-file\n" : "delta transmission enabled\n"); } @@ -565,31 +566,31 @@ void generate_files(int f, struct file_list *flist, char *local_name) } recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, f); + file, i, f_out); } phase++; csum_length = SUM_LENGTH; - ignore_times=1; + ignore_times = 1; if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); - write_int(f,-1); + write_int(f_out, -1); /* files can cycle through the system more than once * 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), - file, i, f); + file, i, f_out); } phase++; if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); - write_int(f,-1); + write_int(f_out, -1); if (preserve_hard_links) do_hard_links(); @@ -598,7 +599,8 @@ void generate_files(int f, struct file_list *flist, char *local_name) * 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; + if (!file->basename || !S_ISDIR(file->mode)) + continue; recv_generator(local_name ? local_name : f_name(file), file, i, -1); }