out_of_memory("flist_expand");
}
-void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
+static void send_file_entry(struct file_struct *file, int f)
{
unsigned short flags;
static time_t modtime;
f_name(file, fname);
- flags = base_flags;
+ flags = file->flags & XMIT_TOP_DIR;
if (file->mode == mode)
flags |= XMIT_SAME_MODE;
* important case. Some systems may not have d_type.
**/
struct file_struct *make_file(char *fname, struct file_list *flist,
+ STRUCT_STAT *stp, unsigned short flags,
int filter_level)
{
static char *lastdir;
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
char *basename, *dirname, *bp;
- unsigned short flags = 0;
if (!flist || !flist->count) /* Ignore lastdir when invalid. */
lastdir_len = -1;
memset(sum, 0, SUM_LENGTH);
- if (readlink_stat(thisname, &st, linkname) != 0) {
+ if (stp && S_ISDIR(stp->st_mode))
+ st = *stp; /* Needed for "symlink/." with --relative. */
+ else if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
/* See if file is excluded before reporting an error. */
if (filter_level != NO_FILTERS
* 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))
+ && S_ISDIR(st.st_mode)) {
+ if (one_file_system > 1)
+ return NULL;
flags |= FLAG_MOUNT_POINT;
+ }
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
return NULL;
}
static struct file_struct *send_file_name(int f, struct file_list *flist,
- char *fname, unsigned short base_flags)
+ char *fname, STRUCT_STAT *stp,
+ unsigned short flags)
{
struct file_struct *file;
- file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
+ file = make_file(fname, flist, stp, flags,
+ f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (!file)
return NULL;
if (file->basename[0]) {
flist->files[flist->count++] = file;
- send_file_entry(file, f, base_flags);
+ send_file_entry(file, f);
}
return file;
}
continue;
}
- send_file_name(f, flist, fbuf, 0);
+ send_file_name(f, flist, fbuf, NULL, 0);
}
fbuf[len] = '\0';
fn = fbuf;
/* Get rid of trailing "/" and "/.". */
while (len) {
- if (fn[len - 1] == '/')
- len--;
+ if (fn[len - 1] == '/') {
+ is_dot_dir = 1;
+ if (!--len && !dir) {
+ len++;
+ break;
+ }
+ }
else if (len >= 2 && fn[len - 1] == '.'
&& fn[len - 2] == '/') {
+ is_dot_dir = 1;
if (!(len -= 2) && !dir) {
len++;
break;
}
fn[len] = '\0';
/* Reject a ".." dir in the active part of the path. */
- if ((p = strstr(fbuf, "..")) != NULL
- && (p[2] == '/' || p[2] == '\0')
- && (p == fbuf || p[-1] == '/')) {
- rprintf(FERROR,
- "using a \"..\" dir is invalid with --relative: %s\n",
- fbuf);
- exit_cleanup(RERR_SYNTAX);
+ for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
+ if ((p[2] == '/' || p[2] == '\0')
+ && (p == fn || p[-1] == '/')) {
+ rprintf(FERROR,
+ "found \"..\" dir in relative path: %s\n",
+ fbuf);
+ exit_cleanup(RERR_SYNTAX);
+ }
}
}
xfer_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
*slash = '\0';
- send_file_name(f, flist, fbuf, 0);
+ send_file_name(f, flist, fbuf, NULL, 0);
*slash = '/';
}
copy_links = save_copy_links;
if (recurse || (xfer_dirs && is_dot_dir)) {
struct file_struct *file;
- if ((file = send_file_name(f, flist, fbuf, XMIT_TOP_DIR)))
+ file = send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR);
+ if (file)
send_if_directory(f, flist, file, fbuf, len);
} else
- send_file_name(f, flist, fbuf, 0);
+ send_file_name(f, flist, fbuf, &st, 0);
if (olddir[0]) {
flist_dir = NULL;
stats.flist_buildtime = 1;
start_tv = end_tv;
- send_file_entry(NULL, f, 0);
+ send_file_entry(NULL, f);
if (show_filelist_p())
finish_filelist_progress(flist);