extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_devices;
+extern int preserve_specials;
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
+extern int skip_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
int io_error;
int checksum_len;
dev_t filesystem_dev; /* used to implement -x */
+unsigned int file_struct_len;
static char empty_sum[MD4_SUM_LENGTH];
static int flist_count_offset;
-static unsigned int file_struct_len;
+static int max_dir_depth = 0;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
static void output_flist(struct file_list *flist);
flags |= XMIT_SAME_MODE;
else
mode = file->mode;
- if (preserve_devices) {
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
- if (IS_DEVICE(mode)) {
- if (file->u.rdev == rdev)
- flags |= XMIT_SAME_RDEV_pre28;
- else
- rdev = file->u.rdev;
- } else
- rdev = makedev(0, 0);
- } else if (IS_DEVICE(mode)) {
+ if (file->u.rdev == rdev)
+ flags |= XMIT_SAME_RDEV_pre28;
+ else
+ rdev = file->u.rdev;
+ } else {
rdev = file->u.rdev;
if ((uint32)major(rdev) == rdev_major)
flags |= XMIT_SAME_RDEV_MAJOR;
if ((uint32)minor(rdev) <= 0xFFu)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
- }
+ } else if (protocol_version < 28)
+ rdev = makedev(0, 0);
if (file->uid == uid)
flags |= XMIT_SAME_UID;
else
add_gid(gid);
write_int(f, gid);
}
- if (preserve_devices && IS_DEVICE(mode)) {
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
if (!(flags & XMIT_SAME_RDEV_pre28))
write_int(f, (int)rdev);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
+ if (chmod_modes && !S_ISLNK(mode))
+ mode = tweak_mode(mode, chmod_modes);
+
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
if (preserve_gid && !(flags & XMIT_SAME_GID))
gid = (gid_t)read_int(f);
- if (preserve_devices) {
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
- if (IS_DEVICE(mode)) {
- if (!(flags & XMIT_SAME_RDEV_pre28))
- rdev = (dev_t)read_int(f);
- } else
- rdev = makedev(0, 0);
- } else if (IS_DEVICE(mode)) {
+ if (!(flags & XMIT_SAME_RDEV_pre28))
+ rdev = (dev_t)read_int(f);
+ } else {
uint32 rdev_minor;
if (!(flags & XMIT_SAME_RDEV_MAJOR))
rdev_major = read_int(f);
rdev_minor = read_int(f);
rdev = makedev(rdev_major, rdev_minor);
}
- }
+ } else if (protocol_version < 28)
+ rdev = makedev(0, 0);
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
memset(bp, 0, file_struct_len);
bp += file_struct_len;
- file->flags = 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
bp[-1] = '\0';
lastdir_depth = count_dir_elements(lastdir);
file->dir.depth = lastdir_depth + 1;
+ if (lastdir_depth >= max_dir_depth)
+ max_dir_depth = lastdir_depth + 1;
} else if (dirname) {
file->dirname = dirname; /* we're reusing lastname */
file->dir.depth = lastdir_depth + 1;
in_del_hier = recurse;
del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2;
if (relative_paths && del_hier_name_len > 2
- && basename_len == 1+1 && *basename == '.')
+ && lastname[del_hier_name_len-1] == '.'
+ && lastname[del_hier_name_len-2] == '/')
del_hier_name_len -= 2;
file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
} else if (in_del_hier) {
if (!relative_paths || !del_hier_name_len
|| (l1 >= del_hier_name_len
- && thisname[del_hier_name_len] == '/'))
+ && lastname[del_hier_name_len] == '/'))
file->flags |= FLAG_DEL_HERE;
else
in_del_hier = 0;
memcpy(bp, basename, basename_len);
bp += basename_len;
- if (preserve_devices && IS_DEVICE(mode))
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode)))
file->u.rdev = rdev;
#ifdef SUPPORT_LINKS
* into a mount-point directory, not to avoid copying a symlinked
* file if -L (or similar) was specified. */
if (one_file_system && st.st_dev != filesystem_dev
- && S_ISDIR(st.st_mode)) {
- if (one_file_system > 1)
+ && S_ISDIR(st.st_mode)) {
+ if (one_file_system > 1) {
+ if (verbose > 2) {
+ rprintf(FINFO, "skipping mount-point dir %s\n",
+ thisname);
+ }
return NULL;
+ }
flags |= FLAG_MOUNT_POINT;
}
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
- if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
- file->mode = tweak_mode(st.st_mode, chmod_modes);
- else
- file->mode = st.st_mode;
+ file->mode = st.st_mode;
file->uid = st.st_uid;
file->gid = st.st_gid;
bp += basename_len;
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- if (preserve_devices && IS_DEVICE(st.st_mode))
+ if ((preserve_devices && IS_DEVICE(st.st_mode))
+ || (preserve_specials && IS_SPECIAL(st.st_mode)))
file->u.rdev = st.st_rdev;
#endif
if (keep_dirlinks && linkname_len && flist) {
STRUCT_STAT st2;
int save_mode = file->mode;
- file->mode = S_IFDIR; /* find a directory w/our name */
+ file->mode = S_IFDIR; /* Find a directory with our name. */
if (flist_find(the_file_list, file) >= 0
&& do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
file->modtime = st2.st_mtime;
if (!file)
return NULL;
+ if (chmod_modes && !S_ISLNK(file->mode))
+ file->mode = tweak_mode(file->mode, chmod_modes);
+
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
* without causing a compatibility problem with older versions. */
clean_flist(flist, 0, 0);
- /* Now send the uid/gid list. This was introduced in
- * protocol version 15 */
send_uid_list(f);
/* send the io_error flag */
clean_flist(flist, relative_paths, 1);
if (f >= 0) {
- /* Now send the uid/gid list. This was introduced in
- * protocol version 15 */
recv_uid_list(f, flist);
/* Recv the io_error flag */
if (!file->basename)
continue;
+
+ if (strip_root && file->dirname) {
+ /* We need to strip off the leading slashes for
+ * relative paths, but this must be done _after_
+ * the sorting phase (above). */
+ if (*file->dirname == '/') {
+ char *s = file->dirname + 1;
+ while (*s == '/') s++;
+ memmove(file->dirname, s, strlen(s) + 1);
+ }
+ if (!*file->dirname)
+ file->dirname = NULL;
+ }
+
if (f_name_cmp(file, flist->files[prev_i]) == 0)
j = prev_i;
else if (protocol_version >= 29 && S_ISDIR(file->mode)) {
file->mode = save_mode;
} else
j = -1;
+
if (j >= 0) {
struct file_struct *fp = flist->files[j];
int keep, drop;
"removing duplicate name %s from file list (%d)\n",
f_name(file, NULL), drop);
}
- /* Make sure that if we unduplicate '.', that we don't
- * lose track of a user-specified top directory. */
+ /* Make sure we don't lose track of a user-specified
+ * top directory. */
flist->files[keep]->flags |= flist->files[drop]->flags
& (FLAG_TOP_DIR|FLAG_DEL_HERE);
}
flist->high = no_dups ? prev_i : flist->count - 1;
- if (strip_root) {
- /* We need to strip off the leading slashes for relative
- * paths, but this must be done _after_ the sorting phase. */
+ if (skip_empty_dirs && no_dups && max_dir_depth) {
+ int j, cur_depth = 0;
+ int *maybe_dirs = new_array(int, max_dir_depth);
+
+ maybe_dirs[0] = -1;
+
for (i = flist->low; i <= flist->high; i++) {
struct file_struct *file = flist->files[i];
- if (!file->dirname)
- continue;
- if (*file->dirname == '/') {
- char *s = file->dirname + 1;
- while (*s == '/') s++;
- memmove(file->dirname, s, strlen(s) + 1);
+ if (S_ISDIR(file->mode) && file->dir.depth) {
+ j = cur_depth;
+ cur_depth = file->dir.depth - 1;
+ for ( ; j >= cur_depth; j--) {
+ if (maybe_dirs[j] < 0)
+ continue;
+ clear_file(maybe_dirs[j], flist);
+ }
+ maybe_dirs[cur_depth] = i;
+ } else if (maybe_dirs[cur_depth] >= 0) {
+ for (j = 0; j <= cur_depth; j++)
+ maybe_dirs[j] = -1;
}
+ }
+ for (j = cur_depth; j >= 0; j--) {
+ if (maybe_dirs[j] < 0)
+ continue;
+ clear_file(maybe_dirs[j], flist);
+ }
- if (!*file->dirname)
- file->dirname = NULL;
+ for (i = flist->low; i <= flist->high; i++) {
+ if (flist->files[i]->basename)
+ break;
+ }
+ flist->low = i;
+ for (i = flist->high; i >= flist->low; i--) {
+ if (flist->files[i]->basename)
+ break;
}
+ flist->high = i;
}
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff