X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e3bcd89319de32db608b3a6f9c58bcaa29abf4da..7f2a1f651e6db7483bcb3d2678dcb60cc4e54582:/generator.c diff --git a/generator.c b/generator.c index 188f51f1..b0913a01 100644 --- a/generator.c +++ b/generator.c @@ -25,10 +25,15 @@ extern int verbose; extern int dry_run; +extern int log_format_has_i; +extern int log_format_has_o_or_i; +extern int daemon_log_format_has_i; +extern int am_root; +extern int am_server; +extern int am_daemon; extern int relative_paths; extern int keep_dirlinks; extern int preserve_links; -extern int am_root; extern int preserve_devices; extern int preserve_hard_links; extern int preserve_perms; @@ -37,6 +42,7 @@ extern int preserve_gid; extern int preserve_times; extern int omit_dir_times; extern int delete_during; +extern int remove_sent_files; extern int update_only; extern int opt_ignore_existing; extern int inplace; @@ -61,6 +67,7 @@ extern int only_existing; extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ +extern struct stats stats; extern struct filter_list_struct server_filter_list; @@ -82,38 +89,44 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) #define SID_UPDATING ITEM_UPDATING #define SID_REPORT_CHECKSUM ITEM_REPORT_CHECKSUM +#define SID_USING_ALT_BASIS ITEM_USING_ALT_BASIS +/* This flag doesn't get sent, so it must be outside 0xffff. */ #define SID_NO_DEST_AND_NO_UPDATE (1<<16) static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st, int32 sflags, int f_out, int ndx) { - int iflags = sflags & (SID_UPDATING | SID_REPORT_CHECKSUM); + int iflags = sflags & 0xffff; if (statret >= 0) { if (S_ISREG(file->mode) && file->length != st->st_size) iflags |= ITEM_REPORT_SIZE; + if (!(sflags & SID_NO_DEST_AND_NO_UPDATE)) { + int keep_time = !preserve_times ? 0 + : S_ISDIR(file->mode) ? !omit_dir_times + : !S_ISLNK(file->mode); + + if ((iflags & ITEM_UPDATING && !keep_time) + || (keep_time && file->modtime != st->st_mtime)) + iflags |= ITEM_REPORT_TIME; + if (preserve_perms && file->mode != st->st_mode) + iflags |= ITEM_REPORT_PERMS; + if (preserve_uid && am_root && file->uid != st->st_uid) + iflags |= ITEM_REPORT_OWNER; + if (preserve_gid && file->gid != GID_NONE + && st->st_gid != file->gid) + iflags |= ITEM_REPORT_GROUP; + } } else - iflags |= ITEM_IS_NEW; - if (statret >= 0 && !(sflags & SID_NO_DEST_AND_NO_UPDATE)) { - int keep_time = !preserve_times ? 0 - : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode); - - if ((iflags & ITEM_UPDATING && !keep_time) - || (keep_time && file->modtime != st->st_mtime)) - iflags |= ITEM_REPORT_TIME; - if (preserve_perms && file->mode != st->st_mode) - iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && file->uid != st->st_uid) - iflags |= ITEM_REPORT_OWNER; - if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid) - iflags |= ITEM_REPORT_GROUP; - } - - if (iflags && !read_batch) { - if (ndx >= 0) - write_int(f_out, ndx); - write_byte(f_out, iflags); - write_byte(f_out, iflags >> 8); + iflags |= ITEM_IS_NEW | ITEM_UPDATING; + + if ((iflags || verbose > 1) && !read_batch) { + if (protocol_version >= 29) { + if (ndx >= 0) + write_int(f_out, ndx); + write_shortint(f_out, iflags); + } else if (ndx >= 0) + log_recv(file, &stats, iflags); } } @@ -334,7 +347,7 @@ static void recv_generator(char *fname, struct file_list *flist, struct file_struct *file, int ndx, int f_out, int f_out_name) { - static int missing_below = -1; + static int missing_below = -1, excluded_below = -1; static char *fuzzy_dirname = NULL; static struct file_list *fuzzy_dirlist = NULL; struct file_struct *fuzzy_file = NULL; @@ -344,11 +357,31 @@ static void recv_generator(char *fname, struct file_list *flist, int statret, stat_errno; char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; + int itemizing, maybe_PERMS_REPORT; uchar fnamecmp_type; + enum logcode code; if (list_only) return; + if (protocol_version >= 29) { + itemizing = 1; + code = daemon_log_format_has_i ? 0 : FLOG; + maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; + } else if (am_daemon) { + itemizing = daemon_log_format_has_i && !dry_run; + code = itemizing || dry_run ? FCLIENT : FINFO; + maybe_PERMS_REPORT = PERMS_REPORT; + } else if (!am_server) { + itemizing = log_format_has_i; + code = itemizing ? 0 : FINFO; + maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; + } else { + itemizing = 0; + code = FINFO; + maybe_PERMS_REPORT = PERMS_REPORT; + } + if (!fname) { if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); @@ -367,14 +400,24 @@ static void recv_generator(char *fname, struct file_list *flist, safe_fname(fname), ndx); } - if (server_filter_list.head - && check_filter(&server_filter_list, fname, - S_ISDIR(file->mode)) < 0) { - if (verbose) { - rprintf(FINFO, "skipping server-excluded file \"%s\"\n", - safe_fname(fname)); + if (server_filter_list.head) { + if (excluded_below >= 0) { + if (file->dir.depth > excluded_below) + goto skipping; + excluded_below = -1; + } + if (check_filter(&server_filter_list, fname, + S_ISDIR(file->mode)) < 0) { + if (S_ISDIR(file->mode)) + excluded_below = file->dir.depth; + skipping: + if (verbose) { + rprintf(FINFO, + "skipping server-excluded file \"%s\"\n", + safe_fname(fname)); + } + return; } - return; } if (missing_below >= 0 && file->dir.depth <= missing_below) { @@ -427,14 +470,14 @@ static void recv_generator(char *fname, struct file_list *flist, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { - delete_file(fname, DEL_TERSE); + delete_file(fname, st.st_mode, DEL_TERSE); statret = -1; } if (dry_run && statret != 0 && missing_below < 0) { missing_below = file->dir.depth; dry_run++; } - if (protocol_version >= 29 && f_out != -1) + if (itemizing && f_out != -1) itemize(file, statret, &st, 0, f_out, ndx); if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT @@ -446,14 +489,14 @@ static void recv_generator(char *fname, struct file_list *flist, } } if (set_perms(fname, file, statret ? NULL : &st, 0) - && verbose && protocol_version < 29 && f_out != -1) - rprintf(FINFO, "%s/\n", safe_fname(fname)); + && verbose && code && f_out != -1) + rprintf(code, "%s/\n", safe_fname(fname)); if (delete_during && f_out != -1 && csum_length != SUM_LENGTH && (file->flags & FLAG_DEL_HERE)) delete_in_dir(flist, fname, file); return; } - + if (max_size && file->length > max_size) { if (verbose > 1) { rprintf(FINFO, "%s is over max-size\n", @@ -474,42 +517,52 @@ static void recv_generator(char *fname, struct file_list *flist, return; } if (statret == 0) { - int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; char lnk[MAXPATHLEN]; int len; - if (!dflag + if (!S_ISDIR(st.st_mode) && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) { lnk[len] = 0; /* A link already pointing to the * right place -- no further action * required. */ if (strcmp(lnk, file->u.link) == 0) { - if (protocol_version >= 29) { + if (itemizing) { itemize(file, 0, &st, 0, f_out, ndx); } set_perms(fname, file, &st, - PERMS_REPORT); + maybe_PERMS_REPORT); return; } } /* Not the right symlink (or not a symlink), so * delete it. */ - delete_file(fname, dflag | DEL_TERSE); + if (S_ISLNK(st.st_mode)) + delete_file(fname, st.st_mode, DEL_TERSE); + else { + delete_file(fname, st.st_mode, DEL_TERSE); + statret = -1; + } } if (do_symlink(file->u.link,fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", full_fname(fname), safe_fname(file->u.link)); } else { set_perms(fname,file,NULL,0); - if (protocol_version >= 29) { + if (itemizing) { itemize(file, statret, &st, SID_UPDATING, f_out, ndx); - } else if (verbose) { - rprintf(FINFO, "%s -> %s\n", safe_fname(fname), + } + if (code && verbose) { + rprintf(code, "%s -> %s\n", safe_fname(fname), safe_fname(file->u.link)); } + if (remove_sent_files && !dry_run) { + char numbuf[4]; + SIVAL(numbuf, 0, ndx); + send_msg(MSG_SUCCESS, numbuf, 4); + } } #endif return; @@ -519,12 +572,12 @@ static void recv_generator(char *fname, struct file_list *flist, if (statret != 0 || st.st_mode != file->mode || st.st_rdev != file->u.rdev) { - int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; - if (protocol_version >= 29) { - itemize(file, statret, &st, SID_UPDATING, - f_out, ndx); + if (IS_DEVICE(st.st_mode)) + delete_file(fname, st.st_mode, DEL_TERSE); + else { + delete_file(fname, st.st_mode, DEL_TERSE); + statret = -1; } - delete_file(fname, dflag | DEL_TERSE); if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", safe_fname(fname), @@ -535,17 +588,21 @@ static void recv_generator(char *fname, struct file_list *flist, full_fname(fname)); } else { set_perms(fname,file,NULL,0); - if (verbose && protocol_version < 29) { - rprintf(FINFO, "%s\n", + if (itemizing) { + itemize(file, statret, &st, SID_UPDATING, + f_out, ndx); + } + if (code && verbose) { + rprintf(code, "%s\n", safe_fname(fname)); } } } else { - if (protocol_version >= 29) { + if (itemizing) { itemize(file, statret, &st, 0, f_out, ndx); } - set_perms(fname, file, &st, PERMS_REPORT); + set_perms(fname, file, &st, maybe_PERMS_REPORT); } return; } @@ -618,8 +675,7 @@ static void recv_generator(char *fname, struct file_list *flist, } if (statret == 0 && !S_ISREG(st.st_mode)) { - int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; - if (delete_file(fname, dflag | DEL_TERSE) != 0) + if (delete_file(fname, st.st_mode, DEL_TERSE) != 0) return; statret = -1; stat_errno = ENOENT; @@ -682,14 +738,14 @@ static void recv_generator(char *fname, struct file_list *flist, else if (fnamecmp_type == FNAMECMP_FUZZY) ; else if (unchanged_file(fnamecmp, file, &st)) { - if (protocol_version >= 29) { + if (itemizing) { itemize(file, statret, &st, fnamecmp_type == FNAMECMP_FNAME ? 0 : SID_NO_DEST_AND_NO_UPDATE, f_out, ndx); } if (fnamecmp_type == FNAMECMP_FNAME) - set_perms(fname, file, &st, PERMS_REPORT); + set_perms(fname, file, &st, maybe_PERMS_REPORT); return; } @@ -766,12 +822,13 @@ prepare_to_open: notify_others: write_int(f_out, ndx); - if (protocol_version >= 29) { - itemize(file, statret, &st, SID_UPDATING - | (always_checksum ? SID_REPORT_CHECKSUM : 0), - f_out, -1); - if (inplace && !read_batch) - write_byte(f_out, fnamecmp_type); + if (itemizing) { + int iflags = SID_UPDATING; + if (always_checksum) + iflags |= SID_REPORT_CHECKSUM; + if (fnamecmp_type != FNAMECMP_FNAME) + iflags |= SID_USING_ALT_BASIS; + itemize(file, statret, &st, iflags, f_out, -1); } if (f_out_name >= 0) { write_byte(f_out_name, fnamecmp_type); @@ -787,7 +844,7 @@ notify_others: #endif } *lb = len; - write_buf(f_out_name, lenbuf, lb - lenbuf + 1); + write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1); write_buf(f_out_name, fuzzy_file->basename, len); } } @@ -831,10 +888,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, } if (verbose >= 2) { - rprintf(FINFO, + rprintf(FINFO, "delta-transmission %s\n", whole_file > 0 - ? "delta-transmission disabled for local transfer or --whole-file\n" - : "delta transmission enabled\n"); + ? "disabled for local transfer or --whole-file" + : "enabled"); } /* We expect to just sit around now, so don't exit on a timeout.