extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-#define SLOT_SIZE (16*1024) /* Desired size in bytes */
-#define PER_SLOT_BITS (SLOT_SIZE * 8) /* Number of bits per slot */
-#define PER_SLOT_INTS (SLOT_SIZE / 4) /* Number of int32s per slot */
-
-static uint32 **delayed_bits = NULL;
-static int delayed_slot_cnt = 0;
+static struct bitbag *delayed_bits = NULL;
static int phase = 0;
-static void init_delayed_bits(int max_ndx)
-{
- delayed_slot_cnt = (max_ndx + PER_SLOT_BITS - 1) / PER_SLOT_BITS;
-
- if (!(delayed_bits = (uint32**)calloc(delayed_slot_cnt, sizeof (uint32*))))
- out_of_memory("set_delayed_bit");
-}
-
-static void set_delayed_bit(int ndx)
-{
- int slot = ndx / PER_SLOT_BITS;
- ndx %= PER_SLOT_BITS;
-
- if (!delayed_bits[slot]) {
- if (!(delayed_bits[slot] = (uint32*)calloc(PER_SLOT_INTS, 4)))
- out_of_memory("set_delayed_bit");
- }
-
- delayed_bits[slot][ndx/32] |= 1u << (ndx % 32);
-}
-
-/* Call this with -1 to start checking from 0. Returns -1 at the end. */
-static int next_delayed_bit(int after)
-{
- uint32 bits, mask;
- int i, ndx = after + 1;
- int slot = ndx / PER_SLOT_BITS;
- ndx %= PER_SLOT_BITS;
-
- mask = (1u << (ndx % 32)) - 1;
- for (i = ndx / 32; slot < delayed_slot_cnt; slot++, i = mask = 0) {
- if (!delayed_bits[slot])
- continue;
- for ( ; i < PER_SLOT_INTS; i++, mask = 0) {
- if (!(bits = delayed_bits[slot][i] & ~mask))
- continue;
- /* The xor magic figures out the lowest enabled bit in
- * bits, and the switch quickly computes log2(bit). */
- switch (bits ^ (bits & (bits-1))) {
-#define LOG2(n) case 1u << n: return slot*PER_SLOT_BITS + i*32 + n
- LOG2(0); LOG2(1); LOG2(2); LOG2(3);
- LOG2(4); LOG2(5); LOG2(6); LOG2(7);
- LOG2(8); LOG2(9); LOG2(10); LOG2(11);
- LOG2(12); LOG2(13); LOG2(14); LOG2(15);
- LOG2(16); LOG2(17); LOG2(18); LOG2(19);
- LOG2(20); LOG2(21); LOG2(22); LOG2(23);
- LOG2(24); LOG2(25); LOG2(26); LOG2(27);
- LOG2(28); LOG2(29); LOG2(30); LOG2(31);
- }
- return -1; /* impossible... */
- }
- }
-
- return -1;
-}
-
/*
* get_tmpname() - create a tmp filename for a given filename
char *fname, *partialptr, numbuf[4];
int i;
- for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
+ for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {
struct file_struct *file = flist->files[i];
- fname = local_name ? local_name : f_name(file);
+ fname = local_name ? local_name : f_name(file, NULL);
if ((partialptr = partial_dir_fname(fname)) != NULL) {
if (make_backups && !make_backup(fname))
continue;
rprintf(FINFO,
"(No batched update for%s \"%s\")\n",
phase ? " resend of" : "",
- f_name(the_file_list->files[next_gen_i]));
+ f_name(the_file_list->files[next_gen_i], NULL));
}
next_gen_i = read_int(batch_gen_fd);
if (next_gen_i == -1)
}
if (delay_updates)
- init_delayed_bits(flist->count);
+ delayed_bits = bitbag_create(flist->count);
while (1) {
cleanup_disable();
continue;
file = flist->files[i];
- fname = local_name ? local_name : f_name_to(file, fbuf);
+ fname = local_name ? local_name : f_name(file, fbuf);
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", fname);
fd1 = -1;
}
- if (fd1 != -1 && !preserve_perms) {
- /* if the file exists already and we aren't preserving
- * permissions then act as though the remote end sent
- * us the file permissions we already have */
- file->mode = st.st_mode;
+ /* If we're not preserving permissions, change the file-list's
+ * mode based on the local permissions and some heuristics. */
+ if (!preserve_perms) {
+ int exists = fd1 != -1;
+ file->mode = dest_mode(file->mode, st.st_mode, exists);
}
/* We now check to see if we are writing file "inplace" */
}
if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
- finish_transfer(fname, fnametmp, file, recv_ok, 1);
- if (partialptr != fname && fnamecmp == partialptr) {
+ if (partialptr == fname || *partial_dir == '/')
+ partialptr = NULL;
+ finish_transfer(fname, fnametmp, partialptr,
+ file, recv_ok, 1);
+ if (fnamecmp == partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
} else if (keep_partial && partialptr
&& handle_partial_dir(partialptr, PDIR_CREATE)) {
- finish_transfer(partialptr, fnametmp, file, recv_ok,
- !partial_dir);
+ finish_transfer(partialptr, fnametmp, NULL,
+ file, recv_ok, !partial_dir);
if (delay_updates && recv_ok) {
- set_delayed_bit(i);
+ bitbag_set_bit(delayed_bits, i);
recv_ok = -1;
}
} else {