static char empty_sum[MD4_SUM_LENGTH];
static int flist_count_offset;
static unsigned int file_struct_len;
-static struct file_list *sorting_flist;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
static void output_flist(struct file_list *flist);
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
perms,
(double)f->length, timestring(f->modtime),
- f_name(f), f->u.link);
+ f_name(f, NULL), f->u.link);
} else
#endif
{
rprintf(FINFO, "%s %11.0f %s %s\n",
perms,
(double)f->length, timestring(f->modtime),
- f_name(f));
+ f_name(f, NULL));
}
}
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;
io_write_phase = "send_file_entry";
- f_name_to(file, fname);
+ f_name(file, fname);
- flags = base_flags;
+ flags = file->flags & XMIT_TOP_DIR;
if (file->mode == mode)
flags |= XMIT_SAME_MODE;
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))
* 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) {
+ if (verbose > 2) {
+ rprintf(FINFO, "skipping mount-point dir %s\n",
+ thisname);
+ }
+ return NULL;
+ }
flags |= FLAG_MOUNT_POINT;
+ }
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
return NULL;
alloc_len = file_struct_len + dirname_len + basename_len
+ linkname_len + sum_len;
- if (flist) {
- bp = pool_alloc(flist->file_pool, alloc_len,
- "receive_file_entry");
- } else {
+ if (flist)
+ bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
+ else {
if (!(bp = new_array(char, alloc_len)))
- out_of_memory("receive_file_entry");
+ out_of_memory("make_file");
}
file = (struct file_struct *)bp;
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;
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;
}
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 (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);
if (file->basename[0]) {
flist->files[flist->count++] = file;
- send_file_entry(file, f, base_flags);
+ send_file_entry(file, f);
}
return file;
}
char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
if (S_ISDIR(file->mode)
- && !(file->flags & FLAG_MOUNT_POINT) && f_name_to(file, fbuf)) {
+ && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
void *save_filters;
unsigned int len = strlen(fbuf);
if (len > 1 && fbuf[len-1] == '/')
rprintf(FINFO,
"cannot send long-named file %s\n",
full_fname(fbuf));
+ continue;
}
- send_file_name(f, flist, fbuf, 0);
+ send_file_name(f, flist, fbuf, NULL, 0);
}
fbuf[len] = '\0';
}
len = strlen(fbuf);
- if (!len || fbuf[len - 1] == '/') {
+ if (relative_paths) {
+ /* We clean up fbuf below. */
+ is_dot_dir = 0;
+ } else if (!len || fbuf[len - 1] == '/') {
if (len == 2 && fbuf[0] == '.') {
/* Turn "./" into just "." rather than "./." */
fbuf[1] = '\0';
fn = p + 1;
} else
fn = fbuf;
- } else if ((p = strstr(fbuf, "/./")) != NULL) {
- *p = '\0';
- if (p == fbuf)
- dir = "/";
- else
- dir = fbuf;
- len -= p - fbuf + 3;
- fn = p + 3;
- } else
- fn = fbuf;
+ } else {
+ if ((p = strstr(fbuf, "/./")) != NULL) {
+ *p = '\0';
+ if (p == fbuf)
+ dir = "/";
+ else
+ dir = fbuf;
+ len -= p - fbuf + 3;
+ fn = p + 3;
+ } else
+ fn = fbuf;
+ /* Get rid of trailing "/" and "/.". */
+ while (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;
+ }
+ } else
+ break;
+ }
+ fn[len] = '\0';
+ /* Reject a ".." dir in the active part of the path. */
+ 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);
+ }
+ }
+ }
if (!*fn) {
len = 1;
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);
maybe_emit_filelist_progress(flist->count);
- if (verbose > 2)
- rprintf(FINFO, "recv_file_name(%s)\n", f_name(file));
+ if (verbose > 2) {
+ rprintf(FINFO, "recv_file_name(%s)\n",
+ f_name(file, NULL));
+ }
}
receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
return;
}
- sorting_flist = flist;
qsort(flist->files, flist->count,
sizeof flist->files[0], (int (*)())file_compare);
- sorting_flist = NULL;
for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
if (flist->files[i]->basename) {
if (verbose > 1 && !am_server) {
rprintf(FINFO,
"removing duplicate name %s from file list (%d)\n",
- f_name(file), drop);
+ f_name(file, NULL), drop);
}
/* Make sure that if we unduplicate '.', that we don't
* lose track of a user-specified top directory. */
}
/* Return a copy of the full filename of a flist entry, using the indicated
- * buffer. No size-checking is done because we checked the size when creating
- * the file_struct entry.
+ * buffer or one of 5 static buffers if fbuf is NULL. No size-checking is
+ * done because we checked the size when creating the file_struct entry.
*/
-char *f_name_to(struct file_struct *f, char *fbuf)
+char *f_name(struct file_struct *f, char *fbuf)
{
if (!f || !f->basename)
return NULL;
+ if (!fbuf) {
+ static char names[5][MAXPATHLEN];
+ static unsigned int n;
+
+ n = (n + 1) % (sizeof names / sizeof names[0]);
+
+ fbuf = names[n];
+ }
+
if (f->dirname) {
int len = strlen(f->dirname);
memcpy(fbuf, f->dirname, len);
return fbuf;
}
-/* Like f_name_to(), but we rotate through 5 static buffers of our own. */
-char *f_name(struct file_struct *f)
-{
- static char names[5][MAXPATHLEN];
- static unsigned int n;
-
- n = (n + 1) % (sizeof names / sizeof names[0]);
-
- return f_name_to(f, names[n]);
-}
-
/* Do a non-recursive scan of the named directory, possibly ignoring all
* exclude rules except for the daemon's. If "dlen" is >=0, it is the length
* of the dirname string, and also indicates that "dirname" is a MAXPATHLEN