X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f75a53e71b584bd1398271629bd021f107881082..95e107db967b69d527015a7d392af80c24288070:/generator.c diff --git a/generator.c b/generator.c index c547529f..a1e56630 100644 --- a/generator.c +++ b/generator.c @@ -25,12 +25,14 @@ extern int verbose; extern int dry_run; +extern int do_xfers; 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 do_progress; extern int recurse; extern int relative_paths; extern int keep_dirlinks; @@ -48,6 +50,7 @@ extern int delete_after; extern int module_id; extern int ignore_errors; extern int remove_sent_files; +extern int delay_updates; extern int update_only; extern int opt_ignore_existing; extern int inplace; @@ -66,9 +69,9 @@ extern int always_checksum; extern char *partial_dir; extern char *basis_dir[]; extern int compare_dest; +extern int copy_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; @@ -203,7 +206,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, { static int min_depth = MAXPATHLEN, cur_depth = -1; static void *filt_array[MAXPATHLEN/2+1]; - static int already_output_warning = 0; + static int already_warned = 0; struct file_list *dirlist; char delbuf[MAXPATHLEN]; STRUCT_STAT st; @@ -227,11 +230,11 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, return; /* Impossible... */ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { - if (already_output_warning) + if (already_warned) return; rprintf(FINFO, "IO error encountered -- skipping file deletion\n"); - already_output_warning = 1; + already_warned = 1; return; } @@ -246,19 +249,24 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, if (link_stat(fbuf, &st, keep_dirlinks) < 0) return; - if (one_file_system && file->flags & FLAG_TOP_DIR) - filesystem_dev = st.st_dev; + if (one_file_system) { + if (file->flags & FLAG_TOP_DIR) + filesystem_dev = st.st_dev; + else if (filesystem_dev != st.st_dev) + return; + } dirlist = get_dirlist(fbuf, dlen, 0); /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ for (i = dirlist->count; i--; ) { - if (!dirlist->files[i]->basename) + struct file_struct *fp = dirlist->files[i]; + if (!fp->basename) continue; - if (flist_find(flist, dirlist->files[i]) < 0) { - int mode = dirlist->files[i]->mode; - f_name_to(dirlist->files[i], delbuf); + if (flist_find(flist, fp) < 0) { + int mode = fp->mode; + f_name_to(fp, delbuf); if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0) break; } @@ -289,6 +297,8 @@ static void do_delete_pass(struct file_list *flist) delete_in_dir(flist, fbuf, file); } + if (do_progress && !am_server) + rprintf(FINFO, " \r"); } static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) @@ -308,7 +318,7 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, - int32 iflags, char *hlink) + int32 iflags, uchar fnamecmp_type, char *xname) { if (statret == 0) { if (S_ISREG(file->mode) && file->length != st->st_size) @@ -329,26 +339,22 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, && st->st_gid != file->gid) iflags |= ITEM_REPORT_GROUP; } - } else { + } else iflags |= ITEM_IS_NEW; - if (!(iflags & (ITEM_HARD_LINKED|ITEM_LOCAL_CHANGE))) - iflags |= ITEM_TRANSFER; - } iflags &= 0xffff; if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1 - || (hlink && *hlink)) && !read_batch) { + || (xname && *xname)) && !read_batch) { if (protocol_version >= 29) { if (ndx >= 0) write_int(sock_f_out, ndx); - /* XXX Temorary compatibility hack */ - if (iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE)) - iflags |= ITEM_REPORT_XATTRS; /* ITEM_UPDATE */ write_shortint(sock_f_out, iflags); - if (hlink) - write_vstring(sock_f_out, hlink, strlen(hlink)); + if (iflags & ITEM_BASIS_TYPE_FOLLOWS) + write_byte(sock_f_out, fnamecmp_type); + if (iflags & ITEM_XNAME_FOLLOWS) + write_vstring(sock_f_out, xname, strlen(xname)); } else if (ndx >= 0) - log_item(file, &stats, iflags, hlink); + log_item(file, &stats, iflags, xname); } } @@ -508,7 +514,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) { int fname_len, fname_suf_len; const char *fname_suf, *fname = file->basename; - uint32 lowest_dist = 0x7FFFFFFF; + uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */ int j, lowest_j = -1; fname_len = strlen(fname); @@ -585,16 +591,16 @@ static int phase = 0; * modification-time repair. */ static void recv_generator(char *fname, struct file_struct *file, int ndx, int itemizing, int maybe_PERMS_REPORT, - enum logcode code, int f_out, int f_out_name) + enum logcode code, int f_out) { static int missing_below = -1, excluded_below = -1; - static char *fuzzy_dirname = NULL; + static char *fuzzy_dirname = ""; static struct file_list *fuzzy_dirlist = NULL; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; - STRUCT_STAT st, partial_st; + STRUCT_STAT st, real_st, partial_st; struct file_struct *back_file = NULL; - int statret, stat_errno; + int statret, real_ret, stat_errno; char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; @@ -606,7 +612,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - fuzzy_dirname = NULL; + fuzzy_dirname = ""; } if (missing_below >= 0) { dry_run--; @@ -650,15 +656,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else { if (fuzzy_basis && S_ISREG(file->mode)) { char *dn = file->dirname ? file->dirname : "."; - /* Yes, identical dirnames are guaranteed to have - * identical pointers at this point. */ - if (fuzzy_dirname != dn) { + if (fuzzy_dirname != dn + && strcmp(fuzzy_dirname, dn) != 0) { if (fuzzy_dirlist) flist_free(fuzzy_dirlist); - fuzzy_dirname = dn; - fuzzy_dirlist = get_dirlist(fuzzy_dirname, -1, - 1); + fuzzy_dirlist = get_dirlist(dn, -1, 1); } + fuzzy_dirname = dn; } statret = link_stat(fname, &st, @@ -669,7 +673,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (only_existing && statret == -1 && stat_errno == ENOENT) { /* we only want to update existing files */ if (verbose > 1) { - rprintf(FINFO, "not creating new file \"%s\"\n", + rprintf(FINFO, "not creating new %s \"%s\"\n", + S_ISDIR(file->mode) ? "directory" : "file", safe_fname(fname)); } return; @@ -691,7 +696,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { - delete_item(fname, st.st_mode, DEL_TERSE); + if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + return; statret = -1; } if (dry_run && statret != 0 && missing_below < 0) { @@ -700,7 +706,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (itemizing && f_out != -1) { itemize(file, ndx, statret, &st, - statret ? ITEM_LOCAL_CHANGE : 0, NULL); + statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT @@ -722,6 +728,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (max_size && file->length > max_size) { if (verbose > 1) { + if (the_file_list->count == 1) + fname = f_name(file); rprintf(FINFO, "%s is over max-size\n", safe_fname(fname)); } @@ -732,6 +740,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, #ifdef SUPPORT_LINKS if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { + if (the_file_list->count == 1) + fname = f_name(file); rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", full_fname(fname), @@ -752,7 +762,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (strcmp(lnk, file->u.link) == 0) { if (itemizing) { itemize(file, ndx, 0, &st, 0, - NULL); + 0, NULL); } set_perms(fname, file, &st, maybe_PERMS_REPORT); @@ -761,12 +771,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } /* Not the right symlink (or not a symlink), so * delete it. */ - if (S_ISLNK(st.st_mode)) - delete_item(fname, st.st_mode, DEL_TERSE); - else { - delete_item(fname, st.st_mode, DEL_TERSE); + if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + return; + if (!S_ISLNK(st.st_mode)) statret = -1; - } } if (do_symlink(file->u.link,fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", @@ -775,7 +783,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_perms(fname,file,NULL,0); if (itemizing) { itemize(file, ndx, statret, &st, - ITEM_LOCAL_CHANGE, NULL); + ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) { rprintf(code, "%s -> %s\n", safe_fname(fname), @@ -795,7 +803,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (statret != 0 || st.st_mode != file->mode || st.st_rdev != file->u.rdev) { - delete_item(fname, st.st_mode, DEL_TERSE); + if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + return; if (!IS_DEVICE(st.st_mode)) statret = -1; if (verbose > 2) { @@ -810,7 +819,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_perms(fname,file,NULL,0); if (itemizing) { itemize(file, ndx, statret, &st, - ITEM_LOCAL_CHANGE, NULL); + ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) { rprintf(code, "%s\n", @@ -819,16 +828,20 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } } else { if (itemizing) - itemize(file, ndx, statret, &st, 0, NULL); + itemize(file, ndx, statret, &st, 0, 0, NULL); set_perms(fname, file, &st, maybe_PERMS_REPORT); } return; } - if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER)) + if (preserve_hard_links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_CHECK_MASTER)) return; if (!S_ISREG(file->mode)) { + if (the_file_list->count == 1) + fname = f_name(file); rprintf(FINFO, "skipping non-regular file \"%s\"\n", safe_fname(fname)); return; @@ -850,6 +863,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, fnamecmp = fname; fnamecmp_type = FNAMECMP_FNAME; + if (statret == 0 && !S_ISREG(st.st_mode)) { + if (delete_item(fname, st.st_mode, DEL_TERSE) != 0) + return; + statret = -1; + stat_errno = ENOENT; + } + if (statret != 0 && basis_dir[0] != NULL) { int best_match = -1; int match_level = 0; @@ -870,6 +890,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, continue; best_match = i; match_level = 2; + if (copy_dest) + break; /* FALL THROUGH */ case 2: if (!unchanged_attrs(file, &st)) @@ -897,29 +919,57 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (hard_link_one(file, ndx, fname, -1, &st, fnamecmpbuf, 1, itemizing && verbose > 1, - code) == 0) + code) == 0) { + if (preserve_hard_links + && file->link_u.links) { + hard_link_cluster(file, ndx, + itemizing, + code); + } return; - if (verbose) { - rsyserr(FINFO, errno, "link %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); } match_level = 2; } #endif - if (compare_dest || (match_level && match_level < 3)) { + if (match_level == 2) { + /* Copy the file locally. */ + if (copy_file(fnamecmpbuf, fname, file->mode) < 0) { + if (verbose) { + rsyserr(FINFO, errno, + "copy_file %s => %s", + full_fname(fnamecmpbuf), + safe_fname(fname)); + } + match_level = 0; + statret = -1; + } else { + if (itemizing) { + itemize(file, ndx, 0, &st, + ITEM_LOCAL_CHANGE, 0, + NULL); + } else if (verbose && code) { + rprintf(code, "%s\n", + safe_fname(fname)); + } + set_perms(fname, file, NULL, + maybe_PERMS_REPORT); + if (preserve_hard_links + && file->link_u.links) { + hard_link_cluster(file, ndx, + itemizing, + code); + } + return; + } + } else if (compare_dest || match_level == 1) { fnamecmp = fnamecmpbuf; fnamecmp_type = i; } } } - if (statret == 0 && !S_ISREG(st.st_mode)) { - if (delete_item(fname, st.st_mode, DEL_TERSE) != 0) - return; - statret = -1; - stat_errno = ENOENT; - } + real_ret = statret; + real_st = st; if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL && link_stat(partialptr, &partial_st, 0) == 0 @@ -938,9 +988,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(FINFO, "fuzzy basis selected for %s: %s\n", safe_fname(fname), safe_fname(fnamecmpbuf)); } - st.st_mode = fuzzy_file->mode; st.st_size = fuzzy_file->length; - st.st_mtime = fuzzy_file->modtime; statret = 0; fnamecmp = fnamecmpbuf; fnamecmp_type = FNAMECMP_FUZZY; @@ -948,7 +996,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0) { - if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) + if (preserve_hard_links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_SKIP)) return; if (stat_errno == ENOENT) goto notify_others; @@ -966,19 +1016,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ; else if (unchanged_file(fnamecmp, file, &st)) { if (fnamecmp_type == FNAMECMP_FNAME) { - if (itemizing) - itemize(file, ndx, statret, &st, 0, NULL); + if (itemizing) { + itemize(file, ndx, real_ret, &real_st, + 0, 0, NULL); + } set_perms(fname, file, &st, maybe_PERMS_REPORT); if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); return; } /* Only --compare-dest gets here. */ - if (unchanged_attrs(file, &st)) { - itemize(file, ndx, statret, &st, - ITEM_NO_DEST_AND_NO_UPDATE, NULL); - return; - } + itemize(file, ndx, real_ret, &real_st, + ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL); + return; } prepare_to_open: @@ -989,7 +1039,7 @@ prepare_to_open: statret = 0; } - if (dry_run || read_batch || whole_file) + if (!do_xfers || read_batch || whole_file) goto notify_others; if (fuzzy_basis) { @@ -1006,13 +1056,15 @@ prepare_to_open: full_fname(fnamecmp)); pretend_missing: /* pretend the file didn't exist */ - if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) + if (preserve_hard_links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_SKIP)) return; - statret = -1; + statret = real_ret = -1; goto notify_others; } - if (inplace && make_backups) { + if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) { if (!(backupptr = get_backup_name(fname))) { close(fd); return; @@ -1054,18 +1106,14 @@ notify_others: if (always_checksum) iflags |= ITEM_REPORT_CHECKSUM; if (fnamecmp_type != FNAMECMP_FNAME) - iflags |= ITEM_USING_ALT_BASIS; - itemize(file, -1, statret, &st, iflags, NULL); - } - if (f_out_name >= 0) { - write_byte(f_out_name, fnamecmp_type); - if (fnamecmp_type == FNAMECMP_FUZZY) { - write_vstring(f_out_name, fuzzy_file->basename, - strlen(fuzzy_file->basename)); - } + iflags |= ITEM_BASIS_TYPE_FOLLOWS; + if (fnamecmp_type == FNAMECMP_FUZZY) + iflags |= ITEM_XNAME_FOLLOWS; + itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type, + fuzzy_file ? fuzzy_file->basename : NULL); } - if (dry_run) { + if (!do_xfers) { if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); return; @@ -1094,8 +1142,7 @@ notify_others: } -void generate_files(int f_out, struct file_list *flist, char *local_name, - int f_out_name) +void generate_files(int f_out, struct file_list *flist, char *local_name) { int i, lull_mod; char fbuf[MAXPATHLEN]; @@ -1105,6 +1152,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, int need_retouch_dir_perms = 0; int save_only_existing = only_existing; int save_opt_ignore_existing = opt_ignore_existing; + int save_do_progress = do_progress; + int save_make_backups = make_backups; allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2; lull_mod = allowed_lull * 5; @@ -1114,9 +1163,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; code = daemon_log_format_has_i ? 0 : FLOG; } else if (am_daemon) { - itemizing = daemon_log_format_has_i && !dry_run; + itemizing = daemon_log_format_has_i && do_xfers; maybe_PERMS_REPORT = PERMS_REPORT; - code = itemizing || dry_run ? FCLIENT : FINFO; + code = itemizing || !do_xfers ? FCLIENT : FINFO; } else if (!am_server) { itemizing = log_format_has_i; maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; @@ -1134,6 +1183,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, if (delete_before && !local_name && flist->count > 0) do_delete_pass(flist); + do_progress = 0; if (whole_file < 0) whole_file = 0; @@ -1144,36 +1194,46 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, : "enabled"); } - if (protocol_version < 29) - ignore_timeout = 1; + /* Since we often fill up the outgoing socket and then just sit around + * waiting for the other 2 processes to do their thing, we don't want + * to exit on a timeout. If the data stops flowing, the receiver will + * notice that and let us know via the redo pipe (or its closing). */ + ignore_timeout = 1; for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; - struct file_struct copy; if (!file->basename) continue; + recv_generator(local_name ? local_name : f_name_to(file, fbuf), + file, i, itemizing, maybe_PERMS_REPORT, code, + f_out); + /* We need to ensure that any dirs we create have writeable * permissions during the time we are putting files within * them. This is then fixed after the transfer is done. */ - if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) { - copy = *file; - copy.mode |= S_IWUSR; /* user write */ - file = © + if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR) + && !list_only) { + int mode = file->mode | S_IWUSR; /* user write */ + char *fname = local_name ? local_name : fbuf; + if (do_chmod(fname, mode & CHMOD_BITS) < 0) { + rsyserr(FERROR, errno, + "failed to modify permissions on %s", + full_fname(fname)); + } need_retouch_dir_perms = 1; } - recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, itemizing, maybe_PERMS_REPORT, code, - f_out, f_out_name); if (preserve_hard_links) check_for_finished_hlinks(itemizing, code); if (allowed_lull && !(i % lull_mod)) maybe_send_keepalive(); + else if (!(i % 200)) + maybe_flush_socket(); } - recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1); + recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during) delete_in_dir(NULL, NULL, NULL); @@ -1184,10 +1244,6 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, ignore_times = 1; make_backups = 0; /* avoid a duplicate backup for inplace processing */ - /* We expect to just sit around now, so don't exit on a timeout. - * If we really get a timeout then the other process should exit. */ - ignore_timeout = 1; - if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); @@ -1199,21 +1255,36 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, struct file_struct *file = flist->files[i]; recv_generator(local_name ? local_name : f_name_to(file, fbuf), file, i, itemizing, maybe_PERMS_REPORT, code, - f_out, f_out_name); + f_out); } phase++; only_existing = save_only_existing; opt_ignore_existing = save_opt_ignore_existing; + make_backups = save_make_backups; if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); write_int(f_out, -1); + /* Reduce round-trip lag-time for a useless delay-updates phase. */ + if (protocol_version >= 29 && !delay_updates) + write_int(f_out, -1); - /* Read post-redo-phase MSG_DONE and any prior messages. */ + /* Read MSG_DONE for the redo phase (and any prior messages). */ get_redo_num(itemizing, code); + if (protocol_version >= 29) { + phase++; + if (verbose > 2) + rprintf(FINFO, "generate_files phase=%d\n", phase); + if (delay_updates) + write_int(f_out, -1); + /* Read MSG_DONE for delay-updates phase & prior messages. */ + get_redo_num(itemizing, code); + } + + do_progress = save_do_progress; if (delete_after && !local_name && flist->count > 0) do_delete_pass(flist); @@ -1229,14 +1300,15 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, continue; if (!need_retouch_dir_times && file->mode & S_IWUSR) continue; - recv_generator(local_name ? local_name : f_name(file), - file, i, itemizing, maybe_PERMS_REPORT, - code, -1, -1); - if (allowed_lull && !(j++ % lull_mod)) + recv_generator(f_name(file), file, i, itemizing, + maybe_PERMS_REPORT, code, -1); + if (allowed_lull && !(++j % lull_mod)) maybe_send_keepalive(); + else if (!(j % 200)) + maybe_flush_socket(); } } - recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1); + recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (max_delete > 0 && deletion_count > max_delete) { rprintf(FINFO,