The Samba-Bugzilla – Attachment 6260 Details for
Bug 7123
Use both old dest file and partial file as basis data
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
fix
generator.c (text/plain), 66.10 KB, created by
smiff
on 2011-02-21 07:36:57 UTC
(
hide
)
Description:
fix
Filename:
MIME Type:
Creator:
smiff
Created:
2011-02-21 07:36:57 UTC
Size:
66.10 KB
patch
obsolete
>/* > * Routines that are exclusive to the generator process. > * > * Copyright (C) 1996-2000 Andrew Tridgell > * Copyright (C) 1996 Paul Mackerras > * Copyright (C) 2002 Martin Pool <mbp@samba.org> > * Copyright (C) 2003-2009 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 3 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, visit the http://fsf.org website. > */ > >#include "rsync.h" > >extern int verbose; >extern int dry_run; >extern int do_xfers; >extern int stdout_format_has_i; >extern int logfile_format_has_i; >extern int am_root; >extern int am_server; >extern int am_daemon; >extern int inc_recurse; >extern int do_progress; >extern int relative_paths; >extern int implied_dirs; >extern int keep_dirlinks; >extern int preserve_acls; >extern int preserve_xattrs; >extern int preserve_links; >extern int preserve_devices; >extern int preserve_specials; >extern int preserve_hard_links; >extern int preserve_executability; >extern int preserve_perms; >extern int preserve_times; >extern int uid_ndx; >extern int gid_ndx; >extern int delete_mode; >extern int delete_before; >extern int delete_during; >extern int delete_after; >extern int msgdone_cnt; >extern int ignore_errors; >extern int remove_source_files; >extern int delay_updates; >extern int update_only; >extern int ignore_existing; >extern int ignore_non_existing; >extern int inplace; >extern int append_mode; >extern int make_backups; >extern int csum_length; >extern int ignore_times; >extern int size_only; >extern OFF_T max_size; >extern OFF_T min_size; >extern int io_error; >extern int flist_eof; >extern int allowed_lull; >extern int sock_f_out; >extern int ignore_timeout; >extern int protocol_version; >extern int file_total; >extern int fuzzy_basis; >extern int always_checksum; >extern int checksum_len; >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 list_only; >extern int read_batch; >extern int safe_symlinks; >extern long block_size; /* "long" because popt can't set an int32. */ >extern int unsort_ndx; >extern int max_delete; >extern int force_delete; >extern int one_file_system; >extern struct stats stats; >extern dev_t filesystem_dev; >extern mode_t orig_umask; >extern uid_t our_uid; >extern char *backup_dir; >extern char *backup_suffix; >extern int backup_suffix_len; >extern struct file_list *cur_flist, *first_flist, *dir_flist; >extern struct filter_list_struct daemon_filter_list; > >int ignore_perishable = 0; >int non_perishable_cnt = 0; >int maybe_ATTRS_REPORT = 0; > >static dev_t dev_zero; >static int deletion_count = 0; /* used to implement --max-delete */ >static int deldelay_size = 0, deldelay_cnt = 0; >static char *deldelay_buf = NULL; >static int deldelay_fd = -1; >static int loopchk_limit; >static int dir_tweaking; >static int symlink_timeset_failed_flags; >static int need_retouch_dir_times; >static int need_retouch_dir_perms; >static const char *solo_file = NULL; > >/* For calling delete_item() and delete_dir_contents(). */ >#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */ >#define DEL_RECURSE (1<<1) /* if dir, delete all contents */ >#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ >#define DEL_FOR_FILE (1<<3) /* making room for a replacement file */ >#define DEL_FOR_DIR (1<<4) /* making room for a replacement dir */ >#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */ >#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */ >#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */ > >#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL) > >enum nonregtype { > TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK >}; > >enum delret { > DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY >}; > >/* Forward declarations. */ >static enum delret delete_dir_contents(char *fname, uint16 flags); >#ifdef SUPPORT_HARD_LINKS >static void handle_skipped_hlink(struct file_struct *file, int itemizing, > enum logcode code, int f_out); >#endif > >int merge_partial( enum logcode, char *, char *); /*SMITH*/ > >static int is_backup_file(char *fn) >{ > int k = strlen(fn) - backup_suffix_len; > return k > 0 && strcmp(fn+k, backup_suffix) == 0; >} > >/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will > * delete recursively. > * > * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's > * a directory! (The buffer is used for recursion, but returned unchanged.) > */ >static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) >{ > enum delret ret; > char *what; > int ok; > > if (verbose > 2) { > rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", > fbuf, (int)mode, (int)flags); > } > > if (flags & DEL_NO_UID_WRITE) > do_chmod(fbuf, mode | S_IWUSR); > > if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { > int save_uid_ndx = uid_ndx; > /* This only happens on the first call to delete_item() since > * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */ > if (!uid_ndx) > uid_ndx = ++file_extra_cnt; > ignore_perishable = 1; > /* If DEL_RECURSE is not set, this just reports emptiness. */ > ret = delete_dir_contents(fbuf, flags); > ignore_perishable = 0; > if (!save_uid_ndx) { > --file_extra_cnt; > uid_ndx = 0; > } > if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT) > goto check_ret; > /* OK: try to delete the directory. */ > } > > if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete) > return DR_AT_LIMIT; > > if (S_ISDIR(mode)) { > what = "rmdir"; > ok = do_rmdir(fbuf) == 0; > } else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) { > what = "make_backup"; > ok = make_backup(fbuf); > } else { > what = "unlink"; > ok = robust_unlink(fbuf) == 0; > } > > if (ok) { > if (!(flags & DEL_MAKE_ROOM)) > log_delete(fbuf, mode); > ret = DR_SUCCESS; > } else { > if (S_ISDIR(mode) && errno == ENOTEMPTY) { > rprintf(FINFO, "cannot delete non-empty directory: %s\n", > fbuf); > ret = DR_NOT_EMPTY; > } else if (errno != ENOENT) { > rsyserr(FERROR, errno, "delete_file: %s(%s) failed", > what, fbuf); > ret = DR_FAILURE; > } else { > deletion_count--; > ret = DR_SUCCESS; > } > } > > check_ret: > if (ret != DR_SUCCESS && flags & DEL_MAKE_ROOM) { > const char *desc; > switch (flags & DEL_MAKE_ROOM) { > case DEL_FOR_FILE: desc = "regular file"; break; > case DEL_FOR_DIR: desc = "directory"; break; > case DEL_FOR_SYMLINK: desc = "symlink"; break; > case DEL_FOR_DEVICE: desc = "device file"; break; > case DEL_FOR_SPECIAL: desc = "special file"; break; > default: exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE */ > } > rprintf(FERROR_XFER, "could not make way for new %s: %s\n", > desc, fbuf); > } > return ret; >} > >/* The directory is about to be deleted: if DEL_RECURSE is given, delete all > * its contents, otherwise just checks for content. Returns DR_SUCCESS or > * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The > * buffer is used for recursion, but returned unchanged.) > */ >static enum delret delete_dir_contents(char *fname, uint16 flags) >{ > struct file_list *dirlist; > enum delret ret; > unsigned remainder; > void *save_filters; > int j, dlen; > char *p; > > if (verbose > 3) { > rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n", > fname, flags); > } > > dlen = strlen(fname); > save_filters = push_local_filters(fname, dlen); > > non_perishable_cnt = 0; > dirlist = get_dirlist(fname, dlen, 0); > ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; > > if (!dirlist->used) > goto done; > > if (!(flags & DEL_RECURSE)) { > ret = DR_NOT_EMPTY; > goto done; > } > > p = fname + dlen; > if (dlen != 1 || *fname != '/') > *p++ = '/'; > remainder = MAXPATHLEN - (p - fname); > > /* We do our own recursion, so make delete_item() non-recursive. */ > flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM|DEL_NO_UID_WRITE)) > | DEL_DIR_IS_EMPTY; > > for (j = dirlist->used; j--; ) { > struct file_struct *fp = dirlist->files[j]; > > if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) { > if (verbose > 1) { > rprintf(FINFO, > "mount point, %s, pins parent directory\n", > f_name(fp, NULL)); > } > ret = DR_NOT_EMPTY; > continue; > } > > strlcpy(p, fp->basename, remainder); > if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) > do_chmod(fname, fp->mode | S_IWUSR); > /* Save stack by recursing to ourself directly. */ > if (S_ISDIR(fp->mode)) { > if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) > ret = DR_NOT_EMPTY; > } > if (delete_item(fname, fp->mode, flags) != DR_SUCCESS) > ret = DR_NOT_EMPTY; > } > > fname[dlen] = '\0'; > > done: > flist_free(dirlist); > pop_local_filters(save_filters); > > if (ret == DR_NOT_EMPTY) { > rprintf(FINFO, "cannot delete non-empty directory: %s\n", > fname); > } > return ret; >} > >static int start_delete_delay_temp(void) >{ > char fnametmp[MAXPATHLEN]; > int save_dry_run = dry_run; > > dry_run = 0; > if (!get_tmpname(fnametmp, "deldelay") > || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) { > rprintf(FINFO, "NOTE: Unable to create delete-delay temp file%s.\n", > inc_recurse ? "" : " -- switching to --delete-after"); > delete_during = 0; > delete_after = !inc_recurse; > dry_run = save_dry_run; > return 0; > } > unlink(fnametmp); > dry_run = save_dry_run; > return 1; >} > >static int flush_delete_delay(void) >{ > if (deldelay_fd < 0 && !start_delete_delay_temp()) > return 0; > if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) { > rsyserr(FERROR, errno, "flush of delete-delay buffer"); > delete_during = 0; > delete_after = !inc_recurse; > close(deldelay_fd); > return 0; > } > deldelay_cnt = 0; > return 1; >} > >static int remember_delete(struct file_struct *file, const char *fname, int flags) >{ > int len; > > if (deldelay_cnt == deldelay_size && !flush_delete_delay()) > return 0; > > if (flags & DEL_NO_UID_WRITE) > deldelay_buf[deldelay_cnt++] = '!'; > > while (1) { > len = snprintf(deldelay_buf + deldelay_cnt, > deldelay_size - deldelay_cnt, > "%x %s%c", > (int)file->mode, fname, '\0'); > if ((deldelay_cnt += len) <= deldelay_size) > break; > deldelay_cnt -= len; > if (!flush_delete_delay()) > return 0; > } > > return 1; >} > >static int read_delay_line(char *buf, int *flags_p) >{ > static int read_pos = 0; > int j, len, mode; > char *bp, *past_space; > > while (1) { > for (j = read_pos; j < deldelay_cnt && deldelay_buf[j]; j++) {} > if (j < deldelay_cnt) > break; > if (deldelay_fd < 0) { > if (j > read_pos) > goto invalid_data; > return -1; > } > deldelay_cnt -= read_pos; > if (deldelay_cnt == deldelay_size) > goto invalid_data; > if (deldelay_cnt && read_pos) { > memmove(deldelay_buf, deldelay_buf + read_pos, > deldelay_cnt); > } > len = read(deldelay_fd, deldelay_buf + deldelay_cnt, > deldelay_size - deldelay_cnt); > if (len == 0) { > if (deldelay_cnt) { > rprintf(FERROR, > "ERROR: unexpected EOF in delete-delay file.\n"); > } > return -1; > } > if (len < 0) { > rsyserr(FERROR, errno, > "reading delete-delay file"); > return -1; > } > deldelay_cnt += len; > read_pos = 0; > } > > bp = deldelay_buf + read_pos; > if (*bp == '!') { > bp++; > *flags_p = DEL_NO_UID_WRITE; > } else > *flags_p = 0; > > if (sscanf(bp, "%x ", &mode) != 1) { > invalid_data: > rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n"); > return -1; > } > past_space = strchr(bp, ' ') + 1; > len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */ > read_pos = j + 1; > > if (len > MAXPATHLEN) { > rprintf(FERROR, "ERROR: filename too long in delete-delay file.\n"); > return -1; > } > > /* The caller needs the name in a MAXPATHLEN buffer, so we copy it > * instead of returning a pointer to our buffer. */ > memcpy(buf, past_space, len); > > return mode; >} > >static void do_delayed_deletions(char *delbuf) >{ > int mode, flags; > > if (deldelay_fd >= 0) { > if (deldelay_cnt && !flush_delete_delay()) > return; > lseek(deldelay_fd, 0, 0); > } > while ((mode = read_delay_line(delbuf, &flags)) >= 0) > delete_item(delbuf, mode, flags | DEL_RECURSE); > if (deldelay_fd >= 0) > close(deldelay_fd); >} > >/* This function is used to implement per-directory deletion, and is used by > * all the --delete-WHEN options. Note that the fbuf pointer must point to a > * MAXPATHLEN buffer with the name of the directory in it (the functions we > * call will append names onto the end, but the old dir value will be restored > * on exit). */ >static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) >{ > static int already_warned = 0; > struct file_list *dirlist; > char delbuf[MAXPATHLEN]; > int dlen, i; > int save_uid_ndx = uid_ndx; > > if (!fbuf) { > change_local_filter_dir(NULL, 0, 0); > return; > } > > if (verbose > 2) > rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); > > if (allowed_lull) > maybe_send_keepalive(); > > if (io_error && !ignore_errors) { > if (already_warned) > return; > rprintf(FINFO, > "IO error encountered -- skipping file deletion\n"); > already_warned = 1; > return; > } > > dlen = strlen(fbuf); > change_local_filter_dir(fbuf, dlen, F_DEPTH(file)); > > if (one_file_system) { > if (file->flags & FLAG_TOP_DIR) > filesystem_dev = *fs_dev; > else if (filesystem_dev != *fs_dev) > return; > } > > if (!uid_ndx) > uid_ndx = ++file_extra_cnt; > > dirlist = get_dirlist(fbuf, dlen, 0); > > /* If an item in dirlist is not found in flist, delete it > * from the filesystem. */ > for (i = dirlist->used; i--; ) { > struct file_struct *fp = dirlist->files[i]; > if (!F_IS_ACTIVE(fp)) > continue; > if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) { > if (verbose > 1) > rprintf(FINFO, "cannot delete mount point: %s\n", > f_name(fp, NULL)); > continue; > } > /* Here we want to match regardless of file type. Replacement > * of a file with one of another type is handled separately by > * a delete_item call with a DEL_MAKE_ROOM flag. */ > if (flist_find_ignore_dirness(cur_flist, fp) < 0) { > int flags = DEL_RECURSE; > if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) > flags |= DEL_NO_UID_WRITE; > f_name(fp, delbuf); > if (delete_during == 2) { > if (!remember_delete(fp, delbuf, flags)) > break; > } else > delete_item(delbuf, fp->mode, flags); > } > } > > flist_free(dirlist); > > if (!save_uid_ndx) { > --file_extra_cnt; > uid_ndx = 0; > } >} > >/* 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. */ >static void do_delete_pass(void) >{ > char fbuf[MAXPATHLEN]; > STRUCT_STAT st; > int j; > > /* dry_run is incremented when the destination doesn't exist yet. */ > if (dry_run > 1 || list_only) > return; > > for (j = 0; j < cur_flist->used; j++) { > struct file_struct *file = cur_flist->sorted[j]; > > f_name(file, fbuf); > > if (!(file->flags & FLAG_CONTENT_DIR)) { > change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(file)); > continue; > } > > if (verbose > 1 && file->flags & FLAG_TOP_DIR) > rprintf(FINFO, "deleting in %s\n", fbuf); > > if (link_stat(fbuf, &st, keep_dirlinks) < 0 > || !S_ISDIR(st.st_mode)) > continue; > > delete_in_dir(fbuf, file, &st.st_dev); > } > delete_in_dir(NULL, NULL, &dev_zero); > > if (do_progress && !am_server) > rprintf(FINFO, " \r"); >} > >int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) >{ >#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES > if (S_ISLNK(file->mode)) { > ; > } else >#endif > if (preserve_times && cmp_time(sxp->st.st_mtime, file->modtime) != 0) > return 0; > > if (preserve_perms) { > if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) > return 0; > } else if (preserve_executability > && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0))) > return 0; > > if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)) > return 0; > > if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file)) > return 0; > >#ifdef SUPPORT_ACLS > if (preserve_acls && !S_ISLNK(file->mode)) { > if (!ACL_READY(*sxp)) > get_acl(fname, sxp); > if (set_acl(NULL, file, sxp) == 0) > return 0; > } >#endif >#ifdef SUPPORT_XATTRS > if (preserve_xattrs) { > if (!XATTR_READY(*sxp)) > get_xattr(fname, sxp); > if (xattr_diff(file, sxp, 0)) > return 0; > } >#endif > > return 1; >} > >void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret, > stat_x *sxp, int32 iflags, uchar fnamecmp_type, > const char *xname) >{ > if (statret >= 0) { /* A from-dest-dir statret can == 1! */ > int keep_time = !preserve_times ? 0 > : S_ISDIR(file->mode) ? preserve_times > 1 : >#if defined HAVE_LUTIMES && defined HAVE_UTIMES > 1; >#else > !S_ISLNK(file->mode); >#endif > > if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) > iflags |= ITEM_REPORT_SIZE; > if (file->flags & FLAG_TIME_FAILED) { /* symlinks only */ > if (iflags & ITEM_LOCAL_CHANGE) > iflags |= symlink_timeset_failed_flags; > } else if (keep_time > ? cmp_time(file->modtime, sxp->st.st_mtime) != 0 > : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED) > && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) > iflags |= ITEM_REPORT_TIME; >#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST > if (S_ISLNK(file->mode)) { > ; > } else >#endif > if (preserve_perms) { > if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) > iflags |= ITEM_REPORT_PERMS; > } else if (preserve_executability > && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0))) > iflags |= ITEM_REPORT_PERMS; > if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) > iflags |= ITEM_REPORT_OWNER; > if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) > && sxp->st.st_gid != (gid_t)F_GROUP(file)) > iflags |= ITEM_REPORT_GROUP; >#ifdef SUPPORT_ACLS > if (preserve_acls && !S_ISLNK(file->mode)) { > if (!ACL_READY(*sxp)) > get_acl(fnamecmp, sxp); > if (set_acl(NULL, file, sxp) == 0) > iflags |= ITEM_REPORT_ACL; > } >#endif >#ifdef SUPPORT_XATTRS > if (preserve_xattrs) { > if (!XATTR_READY(*sxp)) > get_xattr(fnamecmp, sxp); > if (xattr_diff(file, sxp, 1)) > iflags |= ITEM_REPORT_XATTR; > } >#endif > } else { >#ifdef SUPPORT_XATTRS > if (preserve_xattrs && xattr_diff(file, NULL, 1)) > iflags |= ITEM_REPORT_XATTR; >#endif > iflags |= ITEM_IS_NEW; > } > > iflags &= 0xffff; > if ((iflags & (SIGNIFICANT_ITEM_FLAGS|ITEM_REPORT_XATTR) || verbose > 1 > || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) { > if (protocol_version >= 29) { > if (ndx >= 0) > write_ndx(sock_f_out, ndx); > write_shortint(sock_f_out, iflags); > 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)); >#ifdef SUPPORT_XATTRS > if (preserve_xattrs && do_xfers > && iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) { > send_xattr_request(NULL, file, > iflags & ITEM_REPORT_XATTR ? sock_f_out : -1); > } >#endif > } else if (ndx >= 0) { > enum logcode code = logfile_format_has_i ? FINFO : FCLIENT; > log_item(code, file, &stats, iflags, xname); > } > } >} > > >/* Perform our quick-check heuristic for determining if a file is unchanged. */ >int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) >{ > if (st->st_size != F_LENGTH(file)) > return 0; > > /* if always checksum is set then we use the checksum instead > of the file time to determine whether to sync */ > if (always_checksum > 0 && S_ISREG(st->st_mode)) { > char sum[MAX_DIGEST_LEN]; > file_checksum(fn, sum, st->st_size); > return memcmp(sum, F_SUM(file), checksum_len) == 0; > } > > if (size_only > 0) > return 1; > > if (ignore_times) > return 0; > > return cmp_time(st->st_mtime, file->modtime) == 0; >} > > >/* > * set (initialize) the size entries in the per-file sum_struct > * calculating dynamic block and checksum sizes. > * > * This is only called from generate_and_send_sums() but is a separate > * function to encapsulate the logic. > * > * The block size is a rounded square root of file length. > * > * The checksum size is determined according to: > * blocksum_bits = BLOCKSUM_BIAS + 2*log2(file_len) - log2(block_len) > * provided by Donovan Baarda which gives a probability of rsync > * algorithm corrupting data and falling back using the whole md4 > * checksums. > * > * This might be made one of several selectable heuristics. > */ >static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) >{ > int32 blength; > int s2length; > int64 l; > > if (block_size) > blength = block_size; > else if (len <= BLOCK_SIZE * BLOCK_SIZE) > blength = BLOCK_SIZE; > else { > int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE; > int32 c; > int cnt; > for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {} > if (c < 0 || c >= max_blength) > blength = max_blength; > else { > blength = 0; > do { > blength |= c; > if (len < (int64)blength * blength) > blength &= ~c; > c >>= 1; > } while (c >= 8); /* round to multiple of 8 */ > blength = MAX(blength, BLOCK_SIZE); > } > } > > if (protocol_version < 27) { > s2length = csum_length; > } else if (csum_length == SUM_LENGTH) { > s2length = SUM_LENGTH; > } else { > int32 c; > int b = BLOCKSUM_BIAS; > for (l = len; l >>= 1; b += 2) {} > for (c = blength; (c >>= 1) && b; b--) {} > /* add a bit, subtract rollsum, round up. */ > s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */ > s2length = MAX(s2length, csum_length); > s2length = MIN(s2length, SUM_LENGTH); > } > > sum->flength = len; > sum->blength = blength; > sum->s2length = s2length; > sum->remainder = (int32)(len % blength); > sum->count = (int32)(l = (len / blength) + (sum->remainder != 0)); > > if ((int64)sum->count != l) > sum->count = -1; > > if (sum->count && verbose > 2) { > rprintf(FINFO, > "count=%.0f rem=%ld blength=%ld s2length=%d flength=%.0f\n", > (double)sum->count, (long)sum->remainder, (long)sum->blength, > sum->s2length, (double)sum->flength); > } >} > > >/* > * Generate and send a stream of signatures/checksums that describe a buffer > * > * Generate approximately one checksum every block_len bytes. > */ >static int generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) >{ > int32 i; > struct map_struct *mapbuf; > struct sum_struct sum; > OFF_T offset = 0; > > sum_sizes_sqroot(&sum, len); > if (sum.count < 0) > return -1; > write_sum_head(f_out, &sum); > > if (append_mode > 0 && f_copy < 0) > return 0; > > if (len > 0) > mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength); > else > mapbuf = NULL; > > for (i = 0; i < sum.count; i++) { > int32 n1 = (int32)MIN(len, (OFF_T)sum.blength); > char *map = map_ptr(mapbuf, offset, n1); > char sum2[SUM_LENGTH]; > uint32 sum1; > > len -= n1; > offset += n1; > > if (f_copy >= 0) { > full_write(f_copy, map, n1); > if (append_mode > 0) > continue; > } > > sum1 = get_checksum1(map, n1); > get_checksum2(map, n1, sum2); > > if (verbose > 3) { > rprintf(FINFO, > "chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n", > (double)i, (double)offset - n1, (long)n1, > (unsigned long)sum1); > } > write_int(f_out, sum1); > write_buf(f_out, sum2, sum.s2length); > } > > if (mapbuf) > unmap_file(mapbuf); > > return 0; >} > > >/* Try to find a filename in the same dir as "fname" with a similar name. */ >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 = 25 << 16; /* ignore a distance greater than 25 */ > int j, lowest_j = -1; > > fname_len = strlen(fname); > fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len); > > for (j = 0; j < dirlist->used; j++) { > struct file_struct *fp = dirlist->files[j]; > const char *suf, *name; > int len, suf_len; > uint32 dist; > > if (!S_ISREG(fp->mode) || !F_LENGTH(fp) > || fp->flags & FLAG_FILE_SENT) > continue; > > name = fp->basename; > > if (F_LENGTH(fp) == F_LENGTH(file) > && cmp_time(fp->modtime, file->modtime) == 0) { > if (verbose > 4) { > rprintf(FINFO, > "fuzzy size/modtime match for %s\n", > name); > } > return j; > } > > len = strlen(name); > suf = find_filename_suffix(name, len, &suf_len); > > dist = fuzzy_distance(name, len, fname, fname_len); > /* Add some extra weight to how well the suffixes match. */ > dist += fuzzy_distance(suf, suf_len, fname_suf, fname_suf_len) > * 10; > if (verbose > 4) { > rprintf(FINFO, "fuzzy distance for %s = %d.%05d\n", > name, (int)(dist>>16), (int)(dist&0xFFFF)); > } > if (dist <= lowest_dist) { > lowest_dist = dist; > lowest_j = j; > } > } > > return lowest_j; >} > >/* Copy a file found in our --copy-dest handling. */ >static int copy_altdest_file(const char *src, const char *dest, struct file_struct *file) >{ > char buf[MAXPATHLEN]; > const char *copy_to, *partialptr; > int save_preserve_xattrs = preserve_xattrs; > int ok, fd_w; > > if (inplace) { > /* Let copy_file open the destination in place. */ > fd_w = -1; > copy_to = dest; > } else { > fd_w = open_tmpfile(buf, dest, file); > if (fd_w < 0) > return -1; > copy_to = buf; > } > cleanup_set(copy_to, NULL, NULL, -1, -1); > if (copy_file(src, copy_to, fd_w, file->mode, 0) < 0) { > if (verbose) { > rsyserr(FINFO, errno, "copy_file %s => %s", > full_fname(src), copy_to); > } > /* Try to clean up. */ > unlink(copy_to); > cleanup_disable(); > return -1; > } > partialptr = partial_dir ? partial_dir_fname(dest) : NULL; > preserve_xattrs = 0; /* xattrs were copied with file */ > ok = finish_transfer(dest, copy_to, src, partialptr, file, 1, 0); > preserve_xattrs = save_preserve_xattrs; > cleanup_disable(); > return ok ? 0 : -1; >} > >/* This is only called for regular files. We return -2 if we've finished > * handling the file, -1 if no dest-linking occurred, or a non-negative > * value if we found an alternate basis file. */ >static int try_dests_reg(struct file_struct *file, char *fname, int ndx, > char *cmpbuf, stat_x *sxp, int itemizing, > enum logcode code) >{ > int best_match = -1; > int match_level = 0; > int j = 0; > > do { > pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); > if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode)) > continue; > switch (match_level) { > case 0: > best_match = j; > match_level = 1; > /* FALL THROUGH */ > case 1: > if (!unchanged_file(cmpbuf, file, &sxp->st)) > continue; > best_match = j; > match_level = 2; > /* FALL THROUGH */ > case 2: > if (!unchanged_attrs(cmpbuf, file, sxp)) > continue; > best_match = j; > match_level = 3; > break; > } > break; > } while (basis_dir[++j] != NULL); > > if (!match_level) > return -1; > > if (j != best_match) { > j = best_match; > pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); > if (link_stat(cmpbuf, &sxp->st, 0) < 0) > return -1; > } > > if (match_level == 3 && !copy_dest) { >#ifdef SUPPORT_HARD_LINKS > if (link_dest) { > if (!hard_link_one(file, fname, cmpbuf, 1)) > goto try_a_copy; > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); > if (!maybe_ATTRS_REPORT && (verbose > 1 || stdout_format_has_i > 1)) { > itemize(cmpbuf, file, ndx, 1, sxp, > ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, > 0, ""); > } > } else >#endif > if (itemizing) > itemize(cmpbuf, file, ndx, 0, sxp, 0, 0, NULL); > if (verbose > 1 && maybe_ATTRS_REPORT) > rprintf(FCLIENT, "%s is uptodate\n", fname); > return -2; > } > > if (match_level >= 2) { >#ifdef SUPPORT_HARD_LINKS > try_a_copy: /* Copy the file locally. */ >#endif > if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0) > return -1; > if (itemizing) > itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL); > if (maybe_ATTRS_REPORT > && ((!itemizing && verbose && match_level == 2) > || (verbose > 1 && match_level == 3))) { > code = match_level == 3 ? FCLIENT : FINFO; > rprintf(code, "%s%s\n", fname, > match_level == 3 ? " is uptodate" : ""); > } >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, -1); >#endif > return -2; > } > > return FNAMECMP_BASIS_DIR_LOW + j; >} > >/* This is only called for non-regular files. We return -2 if we've finished > * handling the file, or -1 if no dest-linking occurred, or a non-negative > * value if we found an alternate basis file. */ >static int try_dests_non(struct file_struct *file, char *fname, int ndx, > char *cmpbuf, stat_x *sxp, int itemizing, > enum logcode code) >{ > char lnk[MAXPATHLEN]; > int best_match = -1; > int match_level = 0; > enum nonregtype type; > uint32 *devp; > int len, j = 0; > >#ifndef SUPPORT_LINKS > if (S_ISLNK(file->mode)) > return -1; >#endif > if (S_ISDIR(file->mode)) { > type = TYPE_DIR; > } else if (IS_SPECIAL(file->mode)) > type = TYPE_SPECIAL; > else if (IS_DEVICE(file->mode)) > type = TYPE_DEVICE; >#ifdef SUPPORT_LINKS > else if (S_ISLNK(file->mode)) > type = TYPE_SYMLINK; >#endif > else { > rprintf(FERROR, > "internal: try_dests_non() called with invalid mode (%o)\n", > (int)file->mode); > exit_cleanup(RERR_UNSUPPORTED); > } > > do { > pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); > if (link_stat(cmpbuf, &sxp->st, 0) < 0) > continue; > switch (type) { > case TYPE_DIR: > if (!S_ISDIR(sxp->st.st_mode)) > continue; > break; > case TYPE_SPECIAL: > if (!IS_SPECIAL(sxp->st.st_mode)) > continue; > break; > case TYPE_DEVICE: > if (!IS_DEVICE(sxp->st.st_mode)) > continue; > break; >#ifdef SUPPORT_LINKS > case TYPE_SYMLINK: > if (!S_ISLNK(sxp->st.st_mode)) > continue; > break; >#endif > } > if (match_level < 1) { > match_level = 1; > best_match = j; > } > switch (type) { > case TYPE_DIR: > case TYPE_SPECIAL: > break; > case TYPE_DEVICE: > devp = F_RDEV_P(file); > if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp))) > continue; > break; >#ifdef SUPPORT_LINKS > case TYPE_SYMLINK: > if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0) > continue; > lnk[len] = '\0'; > if (strcmp(lnk, F_SYMLINK(file)) != 0) > continue; > break; >#endif > } > if (match_level < 2) { > match_level = 2; > best_match = j; > } > if (unchanged_attrs(cmpbuf, file, sxp)) { > match_level = 3; > best_match = j; > break; > } > } while (basis_dir[++j] != NULL); > > if (!match_level) > return -1; > > if (j != best_match) { > j = best_match; > pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); > if (link_stat(cmpbuf, &sxp->st, 0) < 0) > return -1; > } > > if (match_level == 3) { >#ifdef SUPPORT_HARD_LINKS > if (link_dest >#ifndef CAN_HARDLINK_SYMLINK > && !S_ISLNK(file->mode) >#endif >#ifndef CAN_HARDLINK_SPECIAL > && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode) >#endif > && !S_ISDIR(file->mode)) { > if (do_link(cmpbuf, fname) < 0) { > rsyserr(FERROR_XFER, errno, > "failed to hard-link %s with %s", > cmpbuf, fname); > return j; > } > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); > } else >#endif > match_level = 2; > if (itemizing && stdout_format_has_i > && (verbose > 1 || stdout_format_has_i > 1)) { > int chg = compare_dest && type != TYPE_DIR ? 0 > : ITEM_LOCAL_CHANGE + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0); > char *lp = match_level == 3 ? "" : NULL; > itemize(cmpbuf, file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp); > } > if (verbose > 1 && maybe_ATTRS_REPORT) { > rprintf(FCLIENT, "%s%s is uptodate\n", > fname, type == TYPE_DIR ? "/" : ""); > } > return -2; > } > > return j; >} > >static void list_file_entry(struct file_struct *f) >{ > char permbuf[PERMSTRING_SIZE]; > double len; > > if (!F_IS_ACTIVE(f)) { > /* this can happen if duplicate names were removed */ > return; > } > > permstring(permbuf, f->mode); > len = F_LENGTH(f); > > /* TODO: indicate '+' if the entry has an ACL. */ > >#ifdef SUPPORT_LINKS > if (preserve_links && S_ISLNK(f->mode)) { > rprintf(FINFO, "%s %11.0f %s %s -> %s\n", > permbuf, len, timestring(f->modtime), > f_name(f, NULL), F_SYMLINK(f)); > } else >#endif > { > rprintf(FINFO, "%s %11.0f %s %s\n", > permbuf, len, timestring(f->modtime), > f_name(f, NULL)); > } >} > >static int phase = 0; >static int dflt_perms; > >static int implied_dirs_are_missing; >/* Helper for recv_generator's skip_dir and dry_missing_dir tests. */ >static BOOL is_below(struct file_struct *file, struct file_struct *subtree) >{ > return F_DEPTH(file) > F_DEPTH(subtree) > && (!implied_dirs_are_missing || f_name_has_prefix(file, subtree)); >} > >/* Acts on the indicated item in cur_flist whose name is fname. If a dir, > * make sure it exists, and has the right permissions/timestamp info. For > * all other non-regular files (symlinks, etc.) we create them here. For > * regular files that have changed, we try to find a basis file and then > * start sending checksums. The ndx is the file's unique index value. > * > * The fname parameter must point to a MAXPATHLEN buffer! (e.g it gets > * passed to delete_item(), which can use it during a recursive delete.) > * > * Note that f_out is set to -1 when doing final directory-permission and > * modification-time repair. */ >static void recv_generator(char *fname, struct file_struct *file, int ndx, > int itemizing, enum logcode code, int f_out) >{ > static const char *parent_dirname = ""; > /* Missing dir not created due to --dry-run; will still be scanned. */ > static struct file_struct *dry_missing_dir = NULL; > /* Missing dir whose contents are skipped altogether due to > * --ignore-non-existing, daemon exclude, or mkdir failure. */ > static struct file_struct *skip_dir = NULL; > static struct file_list *fuzzy_dirlist = NULL; > static int need_fuzzy_dirlist = 0; > struct file_struct *fuzzy_file = NULL; > int fd = -1, f_copy = -1; > stat_x sx, real_sx; > STRUCT_STAT partial_st; > struct file_struct *back_file = NULL; > int statret, real_ret, stat_errno; > char *fnamecmp, *partialptr, *backupptr = NULL; > char fnamecmpbuf[MAXPATHLEN]; > uchar fnamecmp_type; > int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0; > int is_dir = !S_ISDIR(file->mode) ? 0 > : inc_recurse && ndx != cur_flist->ndx_start - 1 ? -1 > : 1; > > if (verbose > 2) > rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); > > if (list_only) { > if (is_dir < 0 > || (is_dir && !implied_dirs && file->flags & FLAG_IMPLIED_DIR)) > return; > list_file_entry(file); > return; > } > > if (skip_dir) { > if (is_below(file, skip_dir)) { > if (is_dir) > file->flags |= FLAG_MISSING_DIR; >#ifdef SUPPORT_HARD_LINKS > else if (F_IS_HLINKED(file)) > handle_skipped_hlink(file, itemizing, code, f_out); >#endif > return; > } > skip_dir = NULL; > } > > if (daemon_filter_list.head && (*fname != '.' || fname[1])) { > if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) { > if (is_dir < 0) > return; >#ifdef SUPPORT_HARD_LINKS > if (F_IS_HLINKED(file)) > handle_skipped_hlink(file, itemizing, code, f_out); >#endif > rprintf(FERROR_XFER, > "skipping daemon-excluded %s \"%s\"\n", > is_dir ? "directory" : "file", fname); > if (is_dir) > goto skipping_dir_contents; > return; > } > } > >#ifdef SUPPORT_ACLS > sx.acc_acl = sx.def_acl = NULL; >#endif >#ifdef SUPPORT_XATTRS > sx.xattr = NULL; >#endif > if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) { > parent_is_dry_missing: > if (fuzzy_dirlist) { > flist_free(fuzzy_dirlist); > fuzzy_dirlist = NULL; > } > parent_dirname = ""; > statret = -1; > stat_errno = ENOENT; > } else { > const char *dn = file->dirname ? file->dirname : "."; > dry_missing_dir = NULL; > if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) { > if (relative_paths && !implied_dirs > && do_stat(dn, &sx.st) < 0) { > if (dry_run) > goto parent_is_dry_missing; > if (create_directory_path(fname) < 0) { > rsyserr(FERROR_XFER, errno, > "recv_generator: mkdir %s failed", > full_fname(dn)); > } > } > if (fuzzy_dirlist) { > flist_free(fuzzy_dirlist); > fuzzy_dirlist = NULL; > } > if (fuzzy_basis) > need_fuzzy_dirlist = 1; >#ifdef SUPPORT_ACLS > if (!preserve_perms) > dflt_perms = default_perms_for_dir(dn); >#endif > } > parent_dirname = dn; > > if (need_fuzzy_dirlist && S_ISREG(file->mode)) { > strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf); > fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1); > need_fuzzy_dirlist = 0; > } > > statret = link_stat(fname, &sx.st, keep_dirlinks && is_dir); > stat_errno = errno; > } > > if (ignore_non_existing > 0 && statret == -1 && stat_errno == ENOENT) { > if (is_dir) { > if (is_dir < 0) > return; > skip_dir = file; > file->flags |= FLAG_MISSING_DIR; > } >#ifdef SUPPORT_HARD_LINKS > else if (F_IS_HLINKED(file)) > handle_skipped_hlink(file, itemizing, code, f_out); >#endif > if (verbose > 1) { > rprintf(FINFO, "not creating new %s \"%s\"\n", > is_dir ? "directory" : "file", fname); > } > return; > } > > if (statret == 0 && !(sx.st.st_mode & S_IWUSR) > && !am_root && sx.st.st_uid == our_uid) > del_opts |= DEL_NO_UID_WRITE; > > if (ignore_existing > 0 && statret == 0 > && (!is_dir || !S_ISDIR(sx.st.st_mode))) { > if (verbose > 1 && is_dir >= 0) > rprintf(FINFO, "%s exists\n", fname); >#ifdef SUPPORT_HARD_LINKS > if (F_IS_HLINKED(file)) > handle_skipped_hlink(file, itemizing, code, f_out); >#endif > goto cleanup; > } > > if (is_dir) { > if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR) > goto cleanup; > if (is_dir < 0) { > /* In inc_recurse mode we want to make sure any missing > * directories get created while we're still processing > * the parent dir (which allows us to touch the parent > * dir's mtime right away). We will handle the dir in > * full later (right before we handle its contents). */ > if (statret == 0 > && (S_ISDIR(sx.st.st_mode) > || delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0)) > goto cleanup; /* Any errors get reported later. */ > if (do_mkdir(fname, file->mode & 0700) == 0) > file->flags |= FLAG_DIR_CREATED; > goto cleanup; > } > /* The file to be received is a directory, so we need > * to prepare appropriately. If there is already a > * file of that name and it is *not* a directory, then > * we need to delete it. If it doesn't exist, then > * (perhaps recursively) create it. */ > if (statret == 0 && !S_ISDIR(sx.st.st_mode)) { > if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0) > goto skipping_dir_contents; > statret = -1; > } > if (dry_run && statret != 0) { > if (!dry_missing_dir) > dry_missing_dir = file; > file->flags |= FLAG_MISSING_DIR; > } > real_ret = statret; > real_sx = sx; > if (file->flags & FLAG_DIR_CREATED) > statret = -1; > if (!preserve_perms) { /* See comment in non-dir code below. */ > file->mode = dest_mode(file->mode, sx.st.st_mode, > dflt_perms, statret == 0); > } > if (statret != 0 && basis_dir[0] != NULL) { > int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, > itemizing, code); > if (j == -2) { > itemizing = 0; > code = FNONE; > statret = 1; > } else if (j >= 0) > statret = 1; > } > if (itemizing && f_out != -1) { > itemize(fname, file, ndx, statret, &sx, > statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); > } > if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { > if (!relative_paths || errno != ENOENT > || create_directory_path(fname) < 0 > || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { > rsyserr(FERROR_XFER, errno, > "recv_generator: mkdir %s failed", > full_fname(fname)); > skipping_dir_contents: > rprintf(FERROR, > "*** Skipping any contents from this failed directory ***\n"); > skip_dir = file; > file->flags |= FLAG_MISSING_DIR; > goto cleanup; > } > } >#ifdef SUPPORT_XATTRS > if (preserve_xattrs && statret == 1) > copy_xattrs(fnamecmpbuf, fname); >#endif > if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) > && verbose && code != FNONE && f_out != -1) > rprintf(code, "%s/\n", fname); > > /* We need to ensure that the dirs in the transfer have writable > * permissions during the time we are putting files within them. > * This is then fixed after the transfer is done. */ >#ifdef HAVE_CHMOD > if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) { > mode_t mode = file->mode | S_IWUSR; > if (do_chmod(fname, mode) < 0) { > rsyserr(FERROR_XFER, errno, > "failed to modify permissions on %s", > full_fname(fname)); > } > need_retouch_dir_perms = 1; > } >#endif > > if (real_ret != 0 && one_file_system) > real_sx.st.st_dev = filesystem_dev; > if (inc_recurse) { > if (one_file_system) { > uint32 *devp = F_DIR_DEV_P(file); > DEV_MAJOR(devp) = major(real_sx.st.st_dev); > DEV_MINOR(devp) = minor(real_sx.st.st_dev); > } > } > else if (delete_during && f_out != -1 && !phase > && !(file->flags & FLAG_MISSING_DIR)) { > if (file->flags & FLAG_CONTENT_DIR) > delete_in_dir(fname, file, &real_sx.st.st_dev); > else > change_local_filter_dir(fname, strlen(fname), F_DEPTH(file)); > } > goto cleanup; > } > > /* 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 = statret == 0 && !S_ISDIR(sx.st.st_mode); > file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, > exists); > } > >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_HLINK_NOT_FIRST(file) > && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code)) > goto cleanup; >#endif > > if (preserve_links && S_ISLNK(file->mode)) { >#ifdef SUPPORT_LINKS > const char *sl = F_SYMLINK(file); > if (safe_symlinks && unsafe_symlink(sl, fname)) { > if (verbose) { > if (solo_file) > fname = f_name(file, NULL); > rprintf(FINFO, > "ignoring unsafe symlink %s -> \"%s\"\n", > full_fname(fname), sl); > } > return; > } > if (statret == 0) { > char lnk[MAXPATHLEN]; > int len; > > if (!S_ISLNK(sx.st.st_mode)) > statret = -1; > else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0 > && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') { > /* The link is pointing to the right place. */ > set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); > if (itemizing) > itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); >#if defined SUPPORT_HARD_LINKS && defined CAN_HARDLINK_SYMLINK > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); >#endif > if (remove_source_files == 1) > goto return_with_success; > goto cleanup; > } > /* Not the right symlink (or not a symlink), so > * delete it. */ > if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_SYMLINK) != 0) > goto cleanup; > } else if (basis_dir[0] != NULL) { > int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, > itemizing, code); > if (j == -2) { >#ifndef CAN_HARDLINK_SYMLINK > if (link_dest) { > /* Resort to --copy-dest behavior. */ > } else >#endif > if (!copy_dest) > goto cleanup; > itemizing = 0; > code = FNONE; > } else if (j >= 0) > statret = 1; > } >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { > cur_flist->in_progress++; > goto cleanup; > } >#endif > if (do_symlink(sl, fname) != 0) { > rsyserr(FERROR_XFER, errno, "symlink %s -> \"%s\" failed", > full_fname(fname), sl); > } else { > set_file_attrs(fname, file, NULL, NULL, 0); > if (itemizing) { > itemize(fname, file, ndx, statret, &sx, > ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL); > } > if (code != FNONE && verbose) > rprintf(code, "%s -> %s\n", fname, sl); >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); >#endif > /* This does not check remove_source_files == 1 > * because this is one of the items that the old > * --remove-sent-files option would remove. */ > if (remove_source_files) > goto return_with_success; > } >#endif > goto cleanup; > } > > if ((am_root && preserve_devices && IS_DEVICE(file->mode)) > || (preserve_specials && IS_SPECIAL(file->mode))) { > dev_t rdev; > if (IS_DEVICE(file->mode)) { > uint32 *devp = F_RDEV_P(file); > rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); > } else > rdev = 0; > if (statret == 0) { > int del_for_flag; > if (IS_DEVICE(file->mode)) { > if (!IS_DEVICE(sx.st.st_mode)) > statret = -1; > del_for_flag = DEL_FOR_DEVICE; > } else { > if (!IS_SPECIAL(sx.st.st_mode)) > statret = -1; > del_for_flag = DEL_FOR_SPECIAL; > } > if (statret == 0 > && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT) > && (IS_SPECIAL(sx.st.st_mode) || sx.st.st_rdev == rdev)) { > /* The device or special file is identical. */ > set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); > if (itemizing) > itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); >#endif > if (remove_source_files == 1) > goto return_with_success; > goto cleanup; > } > if (delete_item(fname, sx.st.st_mode, del_opts | del_for_flag) != 0) > goto cleanup; > } else if (basis_dir[0] != NULL) { > int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, > itemizing, code); > if (j == -2) { >#ifndef CAN_HARDLINK_SPECIAL > if (link_dest) { > /* Resort to --copy-dest behavior. */ > } else >#endif > if (!copy_dest) > goto cleanup; > itemizing = 0; > code = FNONE; > } else if (j >= 0) > statret = 1; > } >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { > cur_flist->in_progress++; > goto cleanup; > } >#endif > if (verbose > 2) { > rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n", > fname, (int)file->mode, > (long)major(rdev), (long)minor(rdev)); > } > if (do_mknod(fname, file->mode, rdev) < 0) { > rsyserr(FERROR_XFER, errno, "mknod %s failed", > full_fname(fname)); > } else { > set_file_attrs(fname, file, NULL, NULL, 0); > if (itemizing) { > itemize(fname, file, ndx, statret, &sx, > ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL); > } > if (code != FNONE && verbose) > rprintf(code, "%s\n", fname); >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); >#endif > if (remove_source_files == 1) > goto return_with_success; > } > goto cleanup; > } > > if (!S_ISREG(file->mode)) { > if (solo_file) > fname = f_name(file, NULL); > rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname); > goto cleanup; > } > > if (max_size > 0 && F_LENGTH(file) > max_size) { > if (verbose > 1) { > if (solo_file) > fname = f_name(file, NULL); > rprintf(FINFO, "%s is over max-size\n", fname); > } > goto cleanup; > } > if (min_size > 0 && F_LENGTH(file) < min_size) { > if (verbose > 1) { > if (solo_file) > fname = f_name(file, NULL); > rprintf(FINFO, "%s is under min-size\n", fname); > } > goto cleanup; > } > > if (update_only > 0 && statret == 0 > && cmp_time(sx.st.st_mtime, file->modtime) > 0) { > if (verbose > 1) > rprintf(FINFO, "%s is newer\n", fname); >#ifdef SUPPORT_HARD_LINKS > if (F_IS_HLINKED(file)) > handle_skipped_hlink(file, itemizing, code, f_out); >#endif > goto cleanup; > } > > fnamecmp = fname; > fnamecmp_type = FNAMECMP_FNAME; > > if (statret == 0 && !S_ISREG(sx.st.st_mode)) { > if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_FILE) != 0) > goto cleanup; > statret = -1; > stat_errno = ENOENT; > } > > if (statret != 0 && basis_dir[0] != NULL) { > int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx, > itemizing, code); > if (j == -2) { > if (remove_source_files == 1) > goto return_with_success; > goto cleanup; > } > if (j >= 0) { > fnamecmp = fnamecmpbuf; > fnamecmp_type = j; > statret = 0; > } > } > > real_ret = statret; > real_sx = sx; > > if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL > && link_stat(partialptr, &partial_st, 0) == 0 > && S_ISREG(partial_st.st_mode)) { > if (statret != 0) > goto prepare_to_open; > } else > partialptr = NULL; > > if (statret != 0 && fuzzy_dirlist) { > int j = find_fuzzy(file, fuzzy_dirlist); > if (j >= 0) { > fuzzy_file = fuzzy_dirlist->files[j]; > f_name(fuzzy_file, fnamecmpbuf); > if (verbose > 2) { > rprintf(FINFO, "fuzzy basis selected for %s: %s\n", > fname, fnamecmpbuf); > } > sx.st.st_size = F_LENGTH(fuzzy_file); > statret = 0; > fnamecmp = fnamecmpbuf; > fnamecmp_type = FNAMECMP_FUZZY; > } > } > > if (statret != 0) { >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { > cur_flist->in_progress++; > goto cleanup; > } >#endif > if (stat_errno == ENOENT) > goto notify_others; > rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s", > full_fname(fname)); > goto cleanup; > } > > if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) > ; > else if (fnamecmp_type == FNAMECMP_FUZZY) > ; > else if (unchanged_file(fnamecmp, file, &sx.st)) { > if (partialptr) { > do_unlink(partialptr); > handle_partial_dir(partialptr, PDIR_DELETE); > } > set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); > if (itemizing) > itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL); >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); >#endif > if (remove_source_files != 1) > goto cleanup; > return_with_success: > if (!dry_run) > send_msg_int(MSG_SUCCESS, ndx); > goto cleanup; > } > > if (append_mode > 0 && sx.st.st_size >= F_LENGTH(file)) { >#ifdef SUPPORT_HARD_LINKS > if (F_IS_HLINKED(file)) > handle_skipped_hlink(file, itemizing, code, f_out); >#endif > goto cleanup; > } > > prepare_to_open: > if (partialptr) { > > /* SMITH - merge partial with main file, then use merge as basis */ > if ( ! merge_partial(FLOG,fname,partialptr)) > { > rprintf(FERROR, "Merge Failed: destFile(%s) partialFile(%s)\n", fname, partialptr); > exit_cleanup(RERR_FILEIO); > } > > link_stat(partialptr, &partial_st, 0); /* get stat again */ > > sx.st = partial_st; > fnamecmp = partialptr; > fnamecmp_type = FNAMECMP_PARTIAL_DIR; > statret = 0; > } > > if (!do_xfers) > goto notify_others; > > if (read_batch || whole_file) { > if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) { > if (!(backupptr = get_backup_name(fname))) > goto cleanup; > if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) > goto pretend_missing; > if (copy_file(fname, backupptr, -1, back_file->mode, 1) < 0) { > unmake_file(back_file); > back_file = NULL; > goto cleanup; > } > } > goto notify_others; > } > > if (fuzzy_dirlist) { > int j = flist_find(fuzzy_dirlist, file); > if (j >= 0) /* don't use changing file as future fuzzy basis */ > fuzzy_dirlist->files[j]->flags |= FLAG_FILE_SENT; > } > > /* open the file */ > if ((fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) { > rsyserr(FERROR, errno, "failed to open %s, continuing", > full_fname(fnamecmp)); > pretend_missing: > /* pretend the file didn't exist */ >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { > cur_flist->in_progress++; > goto cleanup; > } >#endif > statret = real_ret = -1; > goto notify_others; > } > > if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) { > if (!(backupptr = get_backup_name(fname))) { > close(fd); > goto cleanup; > } > if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) { > close(fd); > goto pretend_missing; > } > if (robust_unlink(backupptr) && errno != ENOENT) { > rsyserr(FERROR_XFER, errno, "unlink %s", > full_fname(backupptr)); > unmake_file(back_file); > back_file = NULL; > close(fd); > goto cleanup; > } > if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { > int save_errno = errno ? errno : EINVAL; /* 0 paranoia */ > if (errno == ENOENT && make_bak_dir(backupptr) == 0) { > if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) > save_errno = errno ? errno : save_errno; > else > save_errno = 0; > } > if (save_errno) { > rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(backupptr)); > unmake_file(back_file); > back_file = NULL; > close(fd); > goto cleanup; > } > } > fnamecmp_type = FNAMECMP_BACKUP; > } > > if (verbose > 3) { > rprintf(FINFO, "gen mapped %s of size %.0f\n", > fnamecmp, (double)sx.st.st_size); > } > > if (verbose > 2) > rprintf(FINFO, "generating and sending sums for %d\n", ndx); > > notify_others: > if (remove_source_files && !delay_updates && !phase && !dry_run) > increment_active_files(ndx, itemizing, code); > if (inc_recurse && !dry_run) > cur_flist->in_progress++; >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > file->flags |= FLAG_FILE_SENT; >#endif > write_ndx(f_out, ndx); > if (itemizing) { > int iflags = ITEM_TRANSFER; > if (always_checksum > 0) > iflags |= ITEM_REPORT_CHANGE; > if (fnamecmp_type != FNAMECMP_FNAME) > iflags |= ITEM_BASIS_TYPE_FOLLOWS; > if (fnamecmp_type == FNAMECMP_FUZZY) > iflags |= ITEM_XNAME_FOLLOWS; > itemize(fnamecmp, file, -1, real_ret, &real_sx, iflags, fnamecmp_type, > fuzzy_file ? fuzzy_file->basename : NULL); >#ifdef SUPPORT_ACLS > if (preserve_acls) > free_acl(&real_sx); >#endif >#ifdef SUPPORT_XATTRS > if (preserve_xattrs) > free_xattr(&real_sx); >#endif > } > > if (!do_xfers) { >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && F_IS_HLINKED(file)) > finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); >#endif > goto cleanup; > } > if (read_batch) > goto cleanup; > > if (statret != 0 || whole_file) > write_sum_head(f_out, NULL); > else if (sx.st.st_size <= 0) { > write_sum_head(f_out, NULL); > close(fd); > } else { > if (generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy) < 0) { > rprintf(FWARNING, > "WARNING: file is too large for checksum sending: %s\n", > fnamecmp); > write_sum_head(f_out, NULL); > } > close(fd); > } > > cleanup: > if (back_file) { > int save_preserve_xattrs = preserve_xattrs; > if (f_copy >= 0) > close(f_copy); >#ifdef SUPPORT_XATTRS > if (preserve_xattrs) { > copy_xattrs(fname, backupptr); > preserve_xattrs = 0; > } >#endif > set_file_attrs(backupptr, back_file, NULL, NULL, 0); > preserve_xattrs = save_preserve_xattrs; > if (verbose > 1) { > rprintf(FINFO, "backed up %s to %s\n", > fname, backupptr); > } > unmake_file(back_file); > } > >#ifdef SUPPORT_ACLS > if (preserve_acls) > free_acl(&sx); >#endif >#ifdef SUPPORT_XATTRS > if (preserve_xattrs) > free_xattr(&sx); >#endif > return; >} > >#ifdef SUPPORT_HARD_LINKS >static void handle_skipped_hlink(struct file_struct *file, int itemizing, > enum logcode code, int f_out) >{ > char fbuf[MAXPATHLEN]; > int new_last_ndx; > struct file_list *save_flist = cur_flist; > > /* If we skip the last item in a chain of links and there was a > * prior non-skipped hard-link waiting to finish, finish it now. */ > if ((new_last_ndx = skip_hard_link(file, &cur_flist)) < 0) > return; > > file = cur_flist->files[new_last_ndx - cur_flist->ndx_start]; > cur_flist->in_progress--; /* undo prior increment */ > f_name(file, fbuf); > recv_generator(fbuf, file, new_last_ndx, itemizing, code, f_out); > > cur_flist = save_flist; >} >#endif > >static void touch_up_dirs(struct file_list *flist, int ndx) >{ > static int counter = 0; > struct file_struct *file; > char *fname; > BOOL fix_dir_perms; > int i, start, end; > > if (ndx < 0) { > start = 0; > end = flist->used - 1; > } else > start = end = ndx; > > /* Fix any directory permissions that were modified during the > * transfer and/or re-set any tweaked modified-time values. */ > for (i = start; i <= end; i++, counter++) { > file = flist->files[i]; > if (!S_ISDIR(file->mode) > || (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)) > continue; > if (verbose > 3) { > fname = f_name(file, NULL); > rprintf(FINFO, "touch_up_dirs: %s (%d)\n", > NS(fname), i); > } > /* Be sure not to retouch permissions with --fake-super. */ > fix_dir_perms = !am_root && !(file->mode & S_IWUSR); > if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR > || !(need_retouch_dir_times || fix_dir_perms)) > continue; > fname = f_name(file, NULL); > if (fix_dir_perms) > do_chmod(fname, file->mode); > if (need_retouch_dir_times) { > STRUCT_STAT st; > if (link_stat(fname, &st, 0) == 0 > && cmp_time(st.st_mtime, file->modtime) != 0) > set_modtime(fname, file->modtime, file->mode); > } > if (counter >= loopchk_limit) { > if (allowed_lull) > maybe_send_keepalive(); > else > maybe_flush_socket(0); > counter = 0; > } > } >} > >void check_for_finished_files(int itemizing, enum logcode code, int check_redo) >{ > struct file_struct *file; > struct file_list *flist; > char fbuf[MAXPATHLEN]; > int ndx; > > while (1) { >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && (ndx = get_hlink_num()) != -1) { > flist = flist_for_ndx(ndx, "check_for_finished_files.1"); > file = flist->files[ndx - flist->ndx_start]; > assert(file->flags & FLAG_HLINKED); > finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); > flist->in_progress--; > continue; > } >#endif > > if (check_redo && (ndx = get_redo_num()) != -1) { > csum_length = SUM_LENGTH; > max_size = -max_size; > min_size = -min_size; > ignore_existing = -ignore_existing; > ignore_non_existing = -ignore_non_existing; > update_only = -update_only; > always_checksum = -always_checksum; > size_only = -size_only; > append_mode = -append_mode; > make_backups = -make_backups; /* avoid dup backup w/inplace */ > ignore_times++; > > flist = cur_flist; > cur_flist = flist_for_ndx(ndx, "check_for_finished_files.2"); > > file = cur_flist->files[ndx - cur_flist->ndx_start]; > if (solo_file) > strlcpy(fbuf, solo_file, sizeof fbuf); > else > f_name(file, fbuf); > recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out); > cur_flist->to_redo--; > > cur_flist = flist; > > csum_length = SHORT_SUM_LENGTH; > max_size = -max_size; > min_size = -min_size; > ignore_existing = -ignore_existing; > ignore_non_existing = -ignore_non_existing; > update_only = -update_only; > always_checksum = -always_checksum; > size_only = -size_only; > append_mode = -append_mode; > make_backups = -make_backups; > ignore_times--; > continue; > } > > if (cur_flist == first_flist) > break; > > /* We only get here if inc_recurse is enabled. */ > if (first_flist->in_progress || first_flist->to_redo) > break; > > write_ndx(sock_f_out, NDX_DONE); > if (!read_batch) > maybe_flush_socket(1); > > if (delete_during == 2 || !dir_tweaking) { > /* Skip directory touch-up. */ > } else if (first_flist->parent_ndx >= 0) > touch_up_dirs(dir_flist, first_flist->parent_ndx); > > flist_free(first_flist); /* updates first_flist */ > } >} > >void generate_files(int f_out, const char *local_name) >{ > int i, ndx, next_loopchk = 0; > char fbuf[MAXPATHLEN]; > int itemizing; > enum logcode code; > int save_do_progress = do_progress; > > if (protocol_version >= 29) { > itemizing = 1; > maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT; > code = logfile_format_has_i ? FNONE : FLOG; > } else if (am_daemon) { > itemizing = logfile_format_has_i && do_xfers; > maybe_ATTRS_REPORT = ATTRS_REPORT; > code = itemizing || !do_xfers ? FCLIENT : FINFO; > } else if (!am_server) { > itemizing = stdout_format_has_i; > maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT; > code = itemizing ? FNONE : FINFO; > } else { > itemizing = 0; > maybe_ATTRS_REPORT = ATTRS_REPORT; > code = FINFO; > } > solo_file = local_name; > dir_tweaking = !(list_only || solo_file || dry_run); > need_retouch_dir_times = preserve_times > 1; > loopchk_limit = allowed_lull ? allowed_lull * 5 : 200; > symlink_timeset_failed_flags = ITEM_REPORT_TIME > | (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0); > implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30; > > if (verbose > 2) > rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); > > if (delete_before && !solo_file && cur_flist->used > 0) > do_delete_pass(); > if (delete_during == 2) { > deldelay_size = BIGPATHBUFLEN * 4; > deldelay_buf = new_array(char, deldelay_size); > if (!deldelay_buf) > out_of_memory("delete-delay"); > } > do_progress = 0; > > if (append_mode > 0 || whole_file < 0) > whole_file = 0; > if (verbose >= 2) { > rprintf(FINFO, "delta-transmission %s\n", > whole_file > ? "disabled for local transfer or --whole-file" > : "enabled"); > } > > /* 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 message pipe (or its closing). */ > ignore_timeout = 1; > > dflt_perms = (ACCESSPERMS & ~orig_umask); > > do { >#ifdef SUPPORT_HARD_LINKS > if (preserve_hard_links && inc_recurse) { > while (!flist_eof && file_total < FILECNT_LOOKAHEAD/2) > wait_for_receiver(); > } >#endif > if (inc_recurse && cur_flist->parent_ndx >= 0) { > struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx]; > if (solo_file) > strlcpy(fbuf, solo_file, sizeof fbuf); > else > f_name(fp, fbuf); > ndx = cur_flist->ndx_start - 1; > recv_generator(fbuf, fp, ndx, itemizing, code, f_out); > if (delete_during && dry_run < 2 && !list_only > && !(fp->flags & FLAG_MISSING_DIR)) { > if (fp->flags & FLAG_CONTENT_DIR) { > dev_t dirdev; > if (one_file_system) { > uint32 *devp = F_DIR_DEV_P(fp); > dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); > } else > dirdev = MAKEDEV(0, 0); > delete_in_dir(fbuf, fp, &dirdev); > } else > change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp)); > } > } > for (i = cur_flist->low; i <= cur_flist->high; i++) { > struct file_struct *file = cur_flist->sorted[i]; > > if (!F_IS_ACTIVE(file)) > continue; > > if (unsort_ndx) > ndx = F_NDX(file); > else > ndx = i + cur_flist->ndx_start; > > if (solo_file) > strlcpy(fbuf, solo_file, sizeof fbuf); > else > f_name(file, fbuf); > recv_generator(fbuf, file, ndx, itemizing, code, f_out); > > check_for_finished_files(itemizing, code, 0); > > if (i + cur_flist->ndx_start >= next_loopchk) { > if (allowed_lull) > maybe_send_keepalive(); > else > maybe_flush_socket(0); > next_loopchk += loopchk_limit; > } > } > > if (!inc_recurse) { > write_ndx(f_out, NDX_DONE); > break; > } > > while (1) { > check_for_finished_files(itemizing, code, 1); > if (cur_flist->next || flist_eof) > break; > wait_for_receiver(); > } > } while ((cur_flist = cur_flist->next) != NULL); > > if (delete_during) > delete_in_dir(NULL, NULL, &dev_zero); > phase++; > if (verbose > 2) > rprintf(FINFO, "generate_files phase=%d\n", phase); > > while (1) { > check_for_finished_files(itemizing, code, 1); > if (msgdone_cnt) > break; > wait_for_receiver(); > } > > phase++; > if (verbose > 2) > rprintf(FINFO, "generate_files phase=%d\n", phase); > > write_ndx(f_out, NDX_DONE); > > /* Reduce round-trip lag-time for a useless delay-updates phase. */ > if (protocol_version >= 29 && !delay_updates) > write_ndx(f_out, NDX_DONE); > > /* Read MSG_DONE for the redo phase (and any prior messages). */ > while (1) { > check_for_finished_files(itemizing, code, 0); > if (msgdone_cnt > 1) > break; > wait_for_receiver(); > } > > if (protocol_version >= 29) { > phase++; > if (verbose > 2) > rprintf(FINFO, "generate_files phase=%d\n", phase); > if (delay_updates) > write_ndx(f_out, NDX_DONE); > /* Read MSG_DONE for delay-updates phase & prior messages. */ > while (msgdone_cnt == 2) > wait_for_receiver(); > } > > do_progress = save_do_progress; > if (delete_during == 2) > do_delayed_deletions(fbuf); > if (delete_after && !solo_file && file_total > 0) > do_delete_pass(); > > if ((need_retouch_dir_perms || need_retouch_dir_times) > && dir_tweaking && (!inc_recurse || delete_during == 2)) > touch_up_dirs(dir_flist, -1); > > if (max_delete >= 0 && deletion_count > max_delete) { > rprintf(FWARNING, > "Deletions stopped due to --max-delete limit (%d skipped)\n", > deletion_count - max_delete); > io_error |= IOERR_DEL_LIMIT; > } > > if (verbose > 2) > rprintf(FINFO, "generate_files finished\n"); >} > > >/* SMITH */ >int merge_partial( enum logcode FLOG, char * fname, char *partial ) >{ > struct stat st_fname; > struct stat st_partial; > struct stat st_merge; > int BUFFER_SIZE=10000; > unsigned char buffer[BUFFER_SIZE]; > char fmerge[1000]; > FILE *fp_merge; > FILE *fp_fname; > FILE *fp_partial; > off_t byteCount=0; > off_t byteTotal=0; > > rprintf(FLOG, "SMITH: Enter merge_partial\n"); > > /************************************/ > /* is it a merge partial situation? */ > /************************************/ > > if( access( partial, F_OK ) != -1 ) { > stat(partial, &st_partial); > } else { > rprintf(FLOG,"MP: partial file does not exist, merge not possible"); > return 1; > } > > if( access( fname, F_OK ) != -1 ) { > stat(fname, &st_fname); > } else { > rprintf(FLOG,"MP: destination file does not exist, merge not possible"); > return 1; > } > > if ( st_partial.st_size >= st_fname.st_size ) > { > rprintf(FLOG,"MP: partial file (%s) at (%.0f) bytes is >= than destination file (%s) at (%.0f), use partial",partial,(double)st_partial.st_size,fname,(double)st_fname.st_size); > return 1; > } > > rprintf(FLOG, "MP: attempting merge partial: destination file %s is %.0f bytes, partial file %s is %.0f bytes\n", > fname,(double)st_fname.st_size,partial,(double)st_partial.st_size); > > /******************************/ > /* copy partial to merge file */ > /******************************/ > > sprintf(fmerge,"%s.mp",partial); > > fp_partial = fopen(partial,"rb"); /* read only, binary mode */ > > if ( ! fp_partial ) > { > rprintf(FERROR,"Error in merge_partial, cannot open (%s) for reading in binary modei (%s)\n",partial,strerror(errno)); > return 0; > } > > fp_merge = fopen(fmerge,"wb"); > > if ( ! fp_merge ) > { > rprintf(FERROR,"Error in merge_partial, cannot open (%s) for writing in binary mode (%s)\n",fmerge,strerror(errno)); > return 0; > } > > while (!feof(fp_partial)) > { > byteCount = fread(buffer, 1, BUFFER_SIZE, fp_partial); > byteTotal += byteCount; > fwrite(buffer, 1, byteCount, fp_merge); > } > fclose(fp_partial); > > rprintf(FLOG, "MP: %.0f bytes from partial file written to merge file\n", (double)byteTotal); > > fp_fname = fopen(fname,"rb"); /* read only, binary mode */ > > if ( ! fp_partial ) > { > rprintf(FERROR,"Error in merge_partial, cannot open (%s) for reading in binary modei (%s)\n",fname,strerror(errno)); > return 0; > } > > /***********************************************************/ > /* copy from main file from the point the partial finished */ > /***********************************************************/ > > fseek( fp_fname, byteTotal, SEEK_SET ); > > byteCount=0; > byteTotal=0; > > while (!feof(fp_fname)) > { > byteCount = fread(buffer, 1, BUFFER_SIZE, fp_fname); > byteTotal += byteCount; > fwrite(buffer, 1, byteCount, fp_merge); > } > fclose(fp_fname); > rprintf(FLOG, "MP: %.0f bytes from main file written to merge file\n", (double)byteTotal); > > fclose(fp_merge); > > stat(fmerge, &st_merge); > rprintf(FLOG, "MP: final size of merge file (%s) is (%.0f) bytes\n",fmerge,(double)st_merge.st_size); > > if ( -1 == rename( fmerge, partial ) ) > { > rprintf(FERROR,"Error in merge_partial, cannot rename (%s) to (%s) - (%s)\n",fmerge,partial,strerror(errno)); > return 0; > } > > rprintf(FLOG, "SMITH: Exit merge_partial\n"); > return 1; >} >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=6260">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 7123
:
6260
|
6261