- while (next_gen_ndx < desired_ndx) {
- if (next_gen_ndx >= 0) {
- rprintf(FINFO,
- "(No batched update for%s \"%s\")\n",
- redoing ? " resend of" : "",
- f_name(cur_flist->files[next_gen_ndx], NULL));
- }
- next_gen_ndx = read_int(fd);
- if (next_gen_ndx == -1) {
- if (inc_recurse)
- next_gen_ndx = first_flist->prev->used + first_flist->prev->ndx_start;
- else
- next_gen_ndx = cur_flist->used;
+ struct file_list *flist = flist_for_ndx(ndx, "no_batched_update");
+ struct file_struct *file = flist->files[ndx - flist->ndx_start];
+
+ rprintf(FERROR_XFER, "(No batched update for%s \"%s\")\n",
+ is_redo ? " resend of" : "", f_name(file, NULL));
+
+ if (inc_recurse && !dry_run)
+ send_msg_int(MSG_NO_SEND, ndx);
+}
+
+static int we_want_redo(int desired_ndx)
+{
+ static int redo_ndx = -1;
+
+ while (redo_ndx < desired_ndx) {
+ if (redo_ndx >= 0)
+ no_batched_update(redo_ndx, True);
+ if ((redo_ndx = flist_ndx_pop(&batch_redo_list)) < 0)
+ return 0;
+ }
+
+ if (redo_ndx == desired_ndx) {
+ redo_ndx = -1;
+ return 1;
+ }
+
+ return 0;
+}
+
+static int gen_wants_ndx(int desired_ndx, int flist_num)
+{
+ static int next_ndx = -1;
+ static int done_cnt = 0;
+ static BOOL got_eof = False;
+
+ if (got_eof)
+ return 0;
+
+ /* TODO: integrate gen-reading I/O into perform_io() so this is not needed? */
+ io_flush(FULL_FLUSH);
+
+ while (next_ndx < desired_ndx) {
+ if (inc_recurse && flist_num <= done_cnt)
+ return 0;
+ if (next_ndx >= 0)
+ no_batched_update(next_ndx, False);
+ if ((next_ndx = read_int(batch_gen_fd)) < 0) {
+ if (inc_recurse) {
+ done_cnt++;
+ continue;
+ }
+ got_eof = True;
+ return 0;