extern int am_root;
extern int am_server;
extern int am_daemon;
+extern int am_sender;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int cvs_exclude;
extern int recurse;
+extern int keep_dirs;
extern char curr_dir[MAXPATHLEN];
-extern char *files_from;
extern int filesfrom_fd;
extern int one_file_system;
static char empty_sum[MD4_SUM_LENGTH];
static unsigned int file_struct_len;
+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 && (recurse || files_from) && !am_server;
+ return verbose && keep_dirs && !am_server;
}
static void start_filelist_progress(char *kind)
* @post @p buffer contains information about the link or the
* referrent as appropriate, if they exist.
**/
-int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
+static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
{
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
- if (link_stat(path, buffer, keep_dirlinks) < 0)
+ if (link_stat(path, buffer, 0) < 0)
return -1;
if (S_ISLNK(buffer->st_mode)) {
int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
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;
{
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;
strlcpy(lastname, thisname, MAXPATHLEN);
- clean_fname(thisname);
+ clean_fname(thisname, 0);
if (sanitize_paths)
sanitize_path(thisname, thisname, "", 0);
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);
rprintf(FINFO, "skipping overly long name: %s\n", fname);
return NULL;
}
- clean_fname(thisname);
+ clean_fname(thisname, 0);
if (sanitize_paths)
sanitize_path(thisname, thisname, "", 0);
if (exclude_level == NO_EXCLUDES)
goto skip_excludes;
- if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
+ if (S_ISDIR(st.st_mode) && !keep_dirs) {
rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
return NULL;
- if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
- return NULL;
+ if (lp_ignore_nonreadable(module_id)) {
+#if SUPPORT_LINKS
+ if (!S_ISLNK(st.st_mode))
+#endif
+ if (access(thisname, R_OK) != 0)
+ return NULL;
+ }
skip_excludes:
file->basedir = flist_dir;
+ /* This code is only used by the receiver when it is building
+ * a list of files for a delete pass. */
+ if (keep_dirlinks && linkname_len && flist) {
+ STRUCT_STAT st2;
+ int i = flist_find(received_flist, file);
+ if (i >= 0 && S_ISDIR(received_flist->files[i]->mode)
+ && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
+ file->modtime = st2.st_mtime;
+ file->length = st2.st_size;
+ file->mode = st2.st_mode;
+ file->uid = st2.st_uid;
+ file->gid = st2.st_gid;
+ file->u.link = NULL;
+ if (file->link_u.idev) {
+ pool_free(flist->hlink_pool, 0, file->link_u.idev);
+ file->link_u.idev = NULL;
+ }
+ }
+ }
+
if (!S_ISDIR(st.st_mode))
stats.total_size += st.st_size;
if (dname[0] == '.' && (dname[1] == '\0'
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
- if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset)
+ if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset) {
send_file_name(f, flist, fname, recurse, 0);
- else {
+ } else {
io_error |= IOERR_GENERAL;
rprintf(FINFO,
"cannot send long-named file %s\n",
continue;
}
- if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
+ if (S_ISDIR(st.st_mode) && !keep_dirs) {
rprintf(FINFO, "skipping directory %s\n", fname);
continue;
}
}
*p = '/';
if (fn != p || (*lp && *lp != '/')) {
- int copy_links_saved = copy_links;
- int recurse_saved = recurse;
+ int save_copy_links = copy_links;
+ int save_keep_dirs = keep_dirs;
copy_links = copy_unsafe_links;
- /* set recurse to 1 to prevent make_file
- * from ignoring directory, but still
- * turn off the recursive parameter to
- * send_file_name */
- recurse = 1;
+ keep_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
*slash = 0;
send_file_name(f, flist, fname, 0, 0);
*slash = '/';
}
- copy_links = copy_links_saved;
- recurse = recurse_saved;
+ copy_links = save_copy_links;
+ keep_dirs = save_keep_dirs;
*p = 0;
strlcpy(lastpath, fname, sizeof lastpath);
*p = '/';
}
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");
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
+ received_flist = flist;
flist->count = 0;
flist->malloced = 1000;
}
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, who_am_i());
if (list_only) {
int i;
}
}
-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;
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
- if (am_root && preserve_uid)
+ if ((am_root || am_sender) && preserve_uid)
sprintf(uidbuf, " uid=%ld", (long)file->uid);
else
*uidbuf = '\0';
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