X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/73273075c8416fdfcc2b984981e9b4fccc1320eb..ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d:/receiver.c diff --git a/receiver.c b/receiver.c index f91f4a1b..94b6fb40 100644 --- a/receiver.c +++ b/receiver.c @@ -1,77 +1,62 @@ -/* -*- 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 delete_after; +extern int do_xfers; +extern int am_server; +extern int do_progress; +extern int log_before_transfer; +extern int log_format_has_i; +extern int logfile_format_has_i; extern int csum_length; -extern struct stats stats; -extern int dry_run; extern int read_batch; +extern int write_batch; extern int batch_gen_fd; -extern int am_server; 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 char *tmpdir; -extern char *partial_dir; -extern char *basis_dir[]; extern int basis_dir_cnt; extern int make_backups; -extern int do_progress; extern int cleanup_got_literal; -extern int module_id; -extern int ignore_errors; -extern int orig_umask; +extern int remove_sent_files; +extern int append_mode; +extern int sparse_files; extern int keep_partial; extern int checksum_seed; extern int inplace; extern int delay_updates; - +extern struct stats stats; +extern char *log_format; +extern char *tmpdir; +extern char *partial_dir; +extern char *basis_dir[]; +extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; - -/* This deletes any files on the receiving side that are not present on the - * sending side. This is used by --delete-before and --delete-after. */ -void delete_files(struct file_list *flist) -{ - char fbuf[MAXPATHLEN]; - int j; - - for (j = 0; j < flist->count; j++) { - struct file_struct *file = flist->files[j]; - - if (!(file->flags & FLAG_DEL_HERE)) - continue; - - f_name_to(file, fbuf); - if (verbose > 1 && file->flags & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); - - delete_in_dir(flist, fbuf, file); - } -} +static struct bitbag *delayed_bits = NULL; +static int phase = 0; /* @@ -123,8 +108,7 @@ static int get_tmpname(char *fnametmp, char *fname) maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8); if (maxname < 1) { - rprintf(FERROR, "temporary filename too long: %s\n", - safe_fname(fname)); + rprintf(FERROR, "temporary filename too long: %s\n", fname); fnametmp[0] = '\0'; return 0; } @@ -157,13 +141,39 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, mapbuf = map_file(fd_r, size_r, read_size, sum.blength); if (verbose > 2) { rprintf(FINFO, "recv mapped %s of size %.0f\n", - safe_fname(fname_r), (double)size_r); + fname_r, (double)size_r); } } else mapbuf = NULL; sum_init(checksum_seed); + if (append_mode) { + OFF_T j; + sum.flength = (OFF_T)sum.count * sum.blength; + if (sum.remainder) + sum.flength -= sum.blength - sum.remainder; + for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) { + if (do_progress) + show_progress(offset, total_size); + sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE), + CHUNK_SIZE); + offset = j; + } + if (offset < sum.flength) { + int32 len = sum.flength - offset; + if (do_progress) + show_progress(offset, total_size); + sum_update(map_ptr(mapbuf, offset, len), len); + offset = sum.flength; + } + if (fd != -1 && do_lseek(fd, offset, SEEK_SET) != offset) { + rsyserr(FERROR, errno, "lseek failed on %s", + full_fname(fname)); + exit_cleanup(RERR_FILEIO); + } + } + while ((i = recv_token(f_in, &data)) != 0) { if (do_progress) show_progress(offset, total_size); @@ -220,7 +230,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, continue; } } - if (fd != -1 && write_file(fd, map, len) != (int)len) + if (fd != -1 && map && write_file(fd, map, len) != (int)len) goto report_write_error; offset += len; } @@ -257,39 +267,59 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, } -static void read_gen_name(int fd, char *dirname, char *buf) +static void discard_receive_data(int f_in, OFF_T length) { - int dlen; - int len = read_byte(fd); - - if (len & 0x80) { -#if MAXPATHLEN > 32767 - uchar lenbuf[2]; - read_buf(fd, (char *)lenbuf, 2); - len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1]; -#else - len = (len & ~0x80) * 0x100 + read_byte(fd); -#endif - } - - if (dirname) { - dlen = strlcpy(buf, dirname, MAXPATHLEN); - buf[dlen++] = '/'; - } else - dlen = 0; + receive_data(f_in, NULL, -1, 0, NULL, -1, length); +} - if (dlen + len >= MAXPATHLEN) { - rprintf(FERROR, "bogus data on generator name pipe\n"); - exit_cleanup(RERR_PROTOCOL); +static void handle_delayed_updates(struct file_list *flist, char *local_name) +{ + char *fname, *partialptr, numbuf[4]; + int i; + + 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) { + if (make_backups && !make_backup(fname)) + continue; + if (verbose > 2) { + rprintf(FINFO, "renaming %s to %s\n", + partialptr, fname); + } + /* We don't use robust_rename() here because the + * partial-dir must be on the same drive. */ + if (do_rename(partialptr, fname) < 0) { + rsyserr(FERROR, errno, + "rename failed for %s (from %s)", + full_fname(fname), partialptr); + } else { + if (remove_sent_files + || (preserve_hard_links + && file->link_u.links)) { + SIVAL(numbuf, 0, i); + send_msg(MSG_SUCCESS,numbuf,4); + } + handle_partial_dir(partialptr, PDIR_DELETE); + } + } } - - read_sbuf(fd, buf + dlen, len); } - -static void discard_receive_data(int f_in, OFF_T length) +static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i) { - receive_data(f_in, NULL, -1, 0, NULL, -1, length); + while (next_gen_i < desired_i) { + if (next_gen_i >= 0) { + rprintf(FINFO, + "(No batched update for%s \"%s\")\n", + phase ? " resend of" : "", + f_name(the_file_list->files[next_gen_i], NULL)); + } + next_gen_i = read_int(batch_gen_fd); + if (next_gen_i == -1) + next_gen_i = the_file_list->count; + } + return next_gen_i; } @@ -297,22 +327,24 @@ static void discard_receive_data(int f_in, OFF_T length) * main routine for receiver process. * * Receiver process runs on the same host as the generator process. */ -int recv_files(int f_in, struct file_list *flist, char *local_name, - int f_in_name) +int recv_files(int f_in, struct file_list *flist, char *local_name) { int next_gen_i = -1; int fd1,fd2; STRUCT_STAT st; + int iflags, xlen; char *fname, fbuf[MAXPATHLEN]; - char template[MAXPATHLEN]; + char xname[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; - char *fnamecmp, *partialptr; + char *fnamecmp, *partialptr, numbuf[4]; char fnamecmpbuf[MAXPATHLEN]; - uchar *delayed_bits = NULL; + uchar fnamecmp_type; struct file_struct *file; struct stats initial_stats; int save_make_backups = make_backups; - int i, recv_ok, phase = 0; + int itemizing = am_server ? logfile_format_has_i : log_format_has_i; + int max_phase = protocol_version >= 29 ? 2 : 1; + int i, recv_ok; if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); @@ -322,12 +354,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, flist->hlink_pool = NULL; } - if (delay_updates) { - int sz = (flist->count + 7) / 8; - if (!(delayed_bits = new_array(uchar, sz))) - out_of_memory("recv_files"); - memset(delayed_bits, 0, sz); - } + if (delay_updates) + delayed_bits = bitbag_create(flist->count); while (1) { cleanup_disable(); @@ -335,39 +363,46 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, i = read_int(f_in); if (i == -1) { if (read_batch) { - if (next_gen_i != flist->count) { - do { - if (f_in_name >= 0 - && next_gen_i >= 0) - read_byte(f_in_name); - } while (read_int(batch_gen_fd) != -1); - } + get_next_gen_i(batch_gen_fd, next_gen_i, + flist->count); next_gen_i = -1; } - - if (phase) + if (++phase > max_phase) break; - - phase = 1; csum_length = SUM_LENGTH; if (verbose > 2) rprintf(FINFO, "recv_files phase=%d\n", phase); + if (phase == 2 && delay_updates) + handle_delayed_updates(flist, local_name); send_msg(MSG_DONE, "", 0); if (keep_partial && !partial_dir) make_backups = 0; /* prevents double backup */ + if (append_mode) { + append_mode = 0; + sparse_files = 0; + } continue; } - if (i < 0 || i >= flist->count) { - rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n", - i, flist->count); - exit_cleanup(RERR_PROTOCOL); - } + iflags = read_item_attrs(f_in, -1, i, &fnamecmp_type, + xname, &xlen); + if (iflags == ITEM_IS_NEW) /* no-op packet */ + continue; file = flist->files[i]; - if (S_ISDIR(file->mode)) { - rprintf(FERROR, "[%s] got index of directory: %d\n", - who_am_i(), i); + fname = local_name ? local_name : f_name(file, fbuf); + + if (verbose > 2) + rprintf(FINFO, "recv_files(%s)\n", fname); + + if (!(iflags & ITEM_TRANSFER)) { + maybe_log_item(file, iflags, itemizing, xname); + continue; + } + if (phase == 2) { + rprintf(FERROR, + "got transfer request in phase 2 [%s]\n", + who_am_i()); exit_cleanup(RERR_PROTOCOL); } @@ -376,36 +411,32 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, stats.total_transferred_size += file->length; cleanup_got_literal = 0; - fname = local_name ? local_name : f_name_to(file, fbuf); - if (server_filter_list.head && check_filter(&server_filter_list, fname, 0) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); exit_cleanup(RERR_PROTOCOL); } - if (verbose > 2) - rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); - - if (dry_run) { - if (!am_server && verbose) /* log the transfer */ - rprintf(FINFO, "%s\n", safe_fname(fname)); + if (!do_xfers) { /* log the transfer */ + if (!am_server && log_format) + log_item(file, &stats, iflags, NULL); + if (read_batch) + discard_receive_data(f_in, file->length); + continue; + } + if (write_batch < 0) { + log_item(file, &stats, iflags, NULL); + if (!am_server) + discard_receive_data(f_in, file->length); continue; } - - initial_stats = stats; if (read_batch) { - while (i > next_gen_i) { - if (f_in_name >= 0 && next_gen_i >= 0) - read_byte(f_in_name); - next_gen_i = read_int(batch_gen_fd); - if (next_gen_i == -1) - next_gen_i = flist->count; - } + next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i); if (i < next_gen_i) { - rprintf(FINFO, "skipping update for \"%s\"\n", - safe_fname(fname)); + rprintf(FINFO, + "(Skipping batched update for \"%s\")\n", + fname); discard_receive_data(f_in, file->length); continue; } @@ -414,40 +445,72 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, partialptr = partial_dir ? partial_dir_fname(fname) : fname; - if (f_in_name >= 0) { - uchar j; - switch (j = read_byte(f_in_name)) { + if (protocol_version >= 29) { + switch (fnamecmp_type) { case FNAMECMP_FNAME: fnamecmp = fname; break; case FNAMECMP_PARTIAL_DIR: - fnamecmp = partialptr ? partialptr : fname; + fnamecmp = partialptr; break; case FNAMECMP_BACKUP: fnamecmp = get_backup_name(fname); break; case FNAMECMP_FUZZY: - read_gen_name(f_in_name, file->dirname, fnamecmpbuf); - fnamecmp = fnamecmpbuf; + if (file->dirname) { + pathjoin(fnamecmpbuf, MAXPATHLEN, + file->dirname, xname); + fnamecmp = fnamecmpbuf; + } else + fnamecmp = xname; break; default: - if (j >= basis_dir_cnt) { + if (fnamecmp_type >= basis_dir_cnt) { rprintf(FERROR, "invalid basis_dir index: %d.\n", - j); + fnamecmp_type); exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[j], fname); + basis_dir[fnamecmp_type], fname); fnamecmp = fnamecmpbuf; break; } - } else - fnamecmp = fname; + if (!fnamecmp || (server_filter_list.head + && check_filter(&server_filter_list, fname, 0) < 0)) + fnamecmp = fname; + } else { + /* Reminder: --inplace && --partial-dir are never + * enabled at the same time. */ + if (inplace && make_backups) { + if (!(fnamecmp = get_backup_name(fname))) + fnamecmp = fname; + } else if (partial_dir && partialptr) + fnamecmp = partialptr; + else + fnamecmp = fname; + } + + initial_stats = stats; /* open the file */ fd1 = do_open(fnamecmp, O_RDONLY, 0); + if (fd1 == -1 && protocol_version < 29) { + if (fnamecmp != fname) { + fnamecmp = fname; + fd1 = do_open(fnamecmp, O_RDONLY, 0); + } + + if (fd1 == -1 && basis_dir[0]) { + /* pre-29 allowed only one alternate basis */ + pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, + basis_dir[0], fname); + fnamecmp = fnamecmpbuf; + fd1 = do_open(fnamecmp, O_RDONLY, 0); + } + } + if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rsyserr(FERROR, errno, "fstat %s failed", full_fname(fnamecmp)); @@ -474,16 +537,16 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, 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 (inplace) { - fd2 = do_open(fname, O_WRONLY|O_CREAT, 0); + fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600); if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); @@ -500,8 +563,6 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, continue; } - strlcpy(template, fnametmp, sizeof template); - /* we initially set the perms without the * setuid/setgid bits to ensure that there is no race * condition. They are then correctly updated after @@ -514,8 +575,9 @@ 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) { - strlcpy(fnametmp, template, sizeof fnametmp); + && create_directory_path(fnametmp) == 0) { + /* Get back to name with XXXXXX in it. */ + get_tmpname(fnametmp, fname); fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); } if (fd2 == -1) { @@ -527,18 +589,22 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, continue; } - if (partialptr) + if (keep_partial) cleanup_set(fnametmp, partialptr, file, fd1, fd2); } - if (!am_server && verbose) /* log the transfer */ - rprintf(FINFO, "%s\n", safe_fname(fname)); + /* log the transfer */ + if (log_before_transfer) + log_item(file, &initial_stats, iflags, NULL); + else if (!am_server && verbose && do_progress) + rprintf(FINFO, "%s\n", fname); /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, file->length); - log_recv(file, &initial_stats); + if (!log_before_transfer) + log_item(file, &initial_stats, iflags, NULL); if (fd1 != -1) close(fd1); @@ -549,17 +615,27 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, } if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { - finish_transfer(fname, fnametmp, file, recv_ok, 1); - if (partialptr != fname && fnamecmp == 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); 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); - if (delay_updates && recv_ok) - delayed_bits[i/8] |= 1 << (i % 8); + finish_transfer(partialptr, fnametmp, NULL, + file, recv_ok, !partial_dir); + if (delay_updates && recv_ok) { + bitbag_set_bit(delayed_bits, i); + recv_ok = -1; + } } else { partialptr = NULL; do_unlink(fnametmp); @@ -567,9 +643,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, cleanup_disable(); - if (!recv_ok) { - int msgtype = csum_length == SUM_LENGTH || read_batch ? - FERROR : FINFO; + if (recv_ok > 0) { + if (remove_sent_files + || (preserve_hard_links && file->link_u.links)) { + SIVAL(numbuf, 0, i); + send_msg(MSG_SUCCESS, numbuf, 4); + } + } else if (!recv_ok) { + int msgtype = phase || read_batch ? FERROR : FINFO; if (msgtype == FERROR || verbose) { char *errstr, *redostr, *keptstr; if (!(keep_partial && partialptr) && !inplace) @@ -587,49 +668,18 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, } rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", - errstr, safe_fname(fname), - keptstr, redostr); + errstr, fname, keptstr, redostr); } - if (csum_length != SUM_LENGTH) { - char buf[4]; - SIVAL(buf, 0, i); - send_msg(MSG_REDO, buf, 4); + if (!phase) { + SIVAL(numbuf, 0, i); + send_msg(MSG_REDO, numbuf, 4); } } } make_backups = save_make_backups; - if (delay_updates) { - for (i = 0; i < flist->count; i++) { - struct file_struct *file = flist->files[i]; - if (!file->basename - || !(delayed_bits[i/8] & (1 << (i % 8)))) - continue; - fname = local_name ? local_name : f_name(file); - partialptr = partial_dir_fname(fname); - if (partialptr) { - if (make_backups && !make_backup(fname)) - continue; - if (verbose > 2) { - rprintf(FINFO, "renaming %s to %s\n", - safe_fname(partialptr), - safe_fname(fname)); - } - if (do_rename(partialptr, fname) < 0) { - rsyserr(FERROR, errno, - "rename failed for %s (from %s)", - full_fname(fname), - safe_fname(partialptr)); - } else { - handle_partial_dir(partialptr, - PDIR_DELETE); - } - } - } - } - - if (delete_after && !local_name && flist->count > 0) - delete_files(flist); + if (phase == 2 && delay_updates) /* for protocol_version < 29 */ + handle_delayed_updates(flist, local_name); if (verbose > 2) rprintf(FINFO,"recv_files finished\n");