extern int cvs_exclude;
extern int recurse;
-extern int keep_dirs;
+extern int xfer_dirs;
extern char curr_dir[MAXPATHLEN];
extern int filesfrom_fd;
static struct file_list *received_flist;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
-static void output_flist(struct file_list *flist);
+static void output_flist(struct file_list *flist, const char *whose_list);
void init_flist(void)
{
static int show_filelist_p(void)
{
- return verbose && keep_dirs && !am_server;
+ return verbose && xfer_dirs && !am_server;
}
static void start_filelist_progress(char *kind)
new_ptr = realloc_array(flist->files, struct file_struct *,
flist->malloced);
- if (verbose >= 2) {
+ if (verbose >= 2 && flist->malloced != FLIST_START) {
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
who_am_i(),
(double)sizeof flist->files[0] * flist->malloced,
unsigned short flags;
static time_t modtime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
/* We must make sure we don't send a zero flag byte or the
* other end will terminate the flist transfer. Note that
- * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
+ * the use of XMIT_DEL_START on a non-dir has no meaning, so
* it's harmless way to add a bit to the first flag byte. */
if (protocol_version >= 28) {
if (!flags && !S_ISDIR(mode))
- flags |= XMIT_TOP_DIR;
+ flags |= XMIT_DEL_START;
if ((flags & 0xFF00) || !flags) {
flags |= XMIT_EXTENDED_FLAGS;
write_byte(f, flags);
write_byte(f, flags);
} else {
if (!(flags & 0xFF) && !S_ISDIR(mode))
- flags |= XMIT_TOP_DIR;
+ flags |= XMIT_DEL_START;
if (!(flags & 0xFF))
flags |= XMIT_LONG_NAME;
write_byte(f, flags);
{
static time_t modtime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
memset(bp, 0, file_struct_len);
bp += file_struct_len;
- file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+ file->flags = flags & XMIT_DEL_START ? FLAG_DEL_START : 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
if (flags & XMIT_HAS_IDEV_DATA) {
- uint64 inode;
+ int64 inode;
if (protocol_version < 26) {
dev = read_int(f);
inode = read_int(f);
if (exclude_level == NO_EXCLUDES)
goto skip_excludes;
- if (S_ISDIR(st.st_mode) && !keep_dirs) {
+ if (S_ISDIR(st.st_mode) && !xfer_dirs) {
rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
}
+/* Note that the "recurse" value either contains -1, for infinite recursion,
+ * or a number >= 0 indicating how many levels of recursion we will allow. */
static void send_directory(int f, struct file_list *flist, char *dir)
{
DIR *d;
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset) {
- send_file_name(f, flist, fname, recurse, 0);
+ int do_subdirs = recurse >= 1 ? recurse-- : recurse;
+ send_file_name(f, flist, fname, do_subdirs, 0);
} else {
io_error |= IOERR_GENERAL;
rprintf(FINFO,
start_write = stats.total_written;
flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
- "send_file_list");
+ "send_file_list");
if (f != -1) {
io_start_buffering_out();
while (1) {
char fname2[MAXPATHLEN];
char *fname = fname2;
+ int do_subdirs;
if (use_ff_fd) {
if (read_filesfrom_line(filesfrom_fd, fname) == 0)
}
l = strlen(fname);
- if (fname[l - 1] == '/') {
+ if (!l || fname[l - 1] == '/') {
if (l == 2 && fname[0] == '.') {
/* Turn "./" into just "." rather than "./." */
fname[1] = '\0';
fname[l] = '\0';
}
}
+ if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
+ if (!recurse && xfer_dirs)
+ recurse = 1; /* allow one level */
+ } else if (recurse > 0)
+ recurse = 0;
if (link_stat(fname, &st, keep_dirlinks) != 0) {
if (f != -1) {
continue;
}
- if (S_ISDIR(st.st_mode) && !keep_dirs) {
+ if (S_ISDIR(st.st_mode) && !xfer_dirs) {
rprintf(FINFO, "skipping directory %s\n", fname);
continue;
}
*p = '/';
if (fn != p || (*lp && *lp != '/')) {
int save_copy_links = copy_links;
- int save_keep_dirs = keep_dirs;
+ int save_xfer_dirs = xfer_dirs;
copy_links = copy_unsafe_links;
- keep_dirs = 1;
+ xfer_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
*slash = 0;
send_file_name(f, flist, fname, 0, 0);
*slash = '/';
}
copy_links = save_copy_links;
- keep_dirs = save_keep_dirs;
+ xfer_dirs = save_xfer_dirs;
*p = 0;
strlcpy(lastpath, fname, sizeof lastpath);
*p = '/';
if (one_file_system)
set_filesystem(fname);
- send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
+ do_subdirs = recurse >= 1 ? recurse-- : recurse;
+ send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START);
if (olddir[0]) {
flist_dir = NULL;
}
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, f < 0 ? "delete" : who_am_i());
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
}
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, who_am_i());
if (list_only) {
int i;
/* Make sure that if we unduplicate '.', that we don't
* lose track of a user-specified starting point (or
* else deletions will mysteriously fail with -R). */
- if (flist->files[i]->flags & FLAG_TOP_DIR)
- flist->files[prev_i]->flags |= FLAG_TOP_DIR;
+ if (flist->files[i]->flags & FLAG_DEL_START)
+ flist->files[prev_i]->flags |= FLAG_DEL_START;
clear_file(i, flist);
} else
}
}
-static void output_flist(struct file_list *flist)
+static void output_flist(struct file_list *flist, const char *whose_list)
{
char uidbuf[16], gidbuf[16];
struct file_struct *file;
else
*gidbuf = '\0';
rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
- who_am_i(), i, NS(file->basedir), NS(file->dirname),
+ whose_list, i, NS(file->basedir), NS(file->dirname),
NS(file->basename), (int)file->mode,
(double)file->length, uidbuf, gidbuf);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff