X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a9d6e6fcacf363b25023aeec3c8d706714ebebcd..ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d:/receiver.c diff --git a/receiver.c b/receiver.c index 918dad86..94b6fb40 100644 --- a/receiver.c +++ b/receiver.c @@ -1,50 +1,46 @@ -/* -*- c-file-style: "linux" -*- - - Copyright (C) 1996-2000 by Andrew Tridgell - Copyright (C) Paul Mackerras 1996 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* + * Routines only used by the receiving process. + * + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" extern int verbose; extern int do_xfers; -extern int am_daemon; extern int am_server; extern int do_progress; extern int log_before_transfer; extern int log_format_has_i; -extern int daemon_log_format_has_i; +extern int logfile_format_has_i; extern int csum_length; extern int read_batch; extern int write_batch; extern int batch_gen_fd; extern int protocol_version; extern int relative_paths; -extern int keep_dirlinks; extern int preserve_hard_links; extern int preserve_perms; -extern int io_error; extern int basis_dir_cnt; extern int make_backups; extern int cleanup_got_literal; extern int remove_sent_files; -extern int module_id; -extern int ignore_errors; -extern int orig_umask; extern int append_mode; extern int sparse_files; extern int keep_partial; @@ -59,70 +55,9 @@ extern char *basis_dir[]; 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 @@ -342,7 +277,7 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name) 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, NULL); if ((partialptr = partial_dir_fname(fname)) != NULL) { @@ -407,8 +342,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) struct file_struct *file; struct stats initial_stats; int save_make_backups = make_backups; - int itemizing = am_daemon ? daemon_log_format_has_i - : !am_server && log_format_has_i; + int itemizing = am_server ? logfile_format_has_i : log_format_has_i; int max_phase = protocol_version >= 29 ? 2 : 1; int i, recv_ok; @@ -421,7 +355,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } if (delay_updates) - init_delayed_bits(flist->count); + delayed_bits = bitbag_create(flist->count); while (1) { cleanup_disable(); @@ -641,7 +575,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) * because their information should have been previously * transferred, but that may not be the case with -R */ if (fd2 == -1 && relative_paths && errno == ENOENT - && create_directory_path(fnametmp, orig_umask) == 0) { + && create_directory_path(fnametmp) == 0) { /* Get back to name with XXXXXX in it. */ get_tmpname(fnametmp, fname); fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); @@ -681,9 +615,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { - if (partialptr == fname || *partial_dir == '/') - partialptr = NULL; - finish_transfer(fname, fnametmp, partialptr, + char *temp_copy_name; + if (partialptr == fname) + partialptr = temp_copy_name = NULL; + else if (*partial_dir == '/') + temp_copy_name = NULL; + else + temp_copy_name = partialptr; + finish_transfer(fname, fnametmp, temp_copy_name, file, recv_ok, 1); if (fnamecmp == partialptr) { do_unlink(partialptr); @@ -694,7 +633,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) 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 {