Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the changes in symlink handling in non-chroot daemon mode as
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
9fac701
..
0366d9e
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-90,15
+90,15
@@
static int show_filelist_p(void)
static void start_filelist_progress(char *kind)
{
static void start_filelist_progress(char *kind)
{
- rprintf(F
INFO
, "%s ... ", kind);
+ rprintf(F
CLIENT
, "%s ... ", kind);
if (verbose > 1 || do_progress)
if (verbose > 1 || do_progress)
- rprintf(F
INFO
, "\n");
+ rprintf(F
CLIENT
, "\n");
rflush(FINFO);
}
static void emit_filelist_progress(int count)
{
rflush(FINFO);
}
static void emit_filelist_progress(int count)
{
- rprintf(F
INFO
, " %d files...\r", count);
+ rprintf(F
CLIENT
, " %d files...\r", count);
}
static void maybe_emit_filelist_progress(int count)
}
static void maybe_emit_filelist_progress(int count)
@@
-160,8
+160,6
@@
static void list_file_entry(struct file_struct *f)
static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf)
{
#ifdef SUPPORT_LINKS
static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf)
{
#ifdef SUPPORT_LINKS
- if (copy_links)
- return do_stat(path, stp);
if (link_stat(path, stp, copy_dirlinks) < 0)
return -1;
if (S_ISLNK(stp->st_mode)) {
if (link_stat(path, stp, copy_dirlinks) < 0)
return -1;
if (S_ISLNK(stp->st_mode)) {
@@
-284,7
+282,7
@@
void flist_expand(struct file_list *flist)
flist->malloced);
if (verbose >= 2 && flist->malloced != FLIST_START) {
flist->malloced);
if (verbose >= 2 && flist->malloced != FLIST_START) {
- rprintf(F
INFO
, "[%s] expand file_list to %.0f bytes, did%s move\n",
+ rprintf(F
CLIENT
, "[%s] expand file_list to %.0f bytes, did%s move\n",
who_am_i(),
(double)sizeof flist->files[0] * flist->malloced,
(new_ptr == flist->files) ? " not" : "");
who_am_i(),
(double)sizeof flist->files[0] * flist->malloced,
(new_ptr == flist->files) ? " not" : "");
@@
-316,7
+314,7
@@
static void send_file_entry(struct file_struct *file, int f)
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
- dev = 0, rdev =
makedev
(0, 0);
+ dev = 0, rdev =
MAKEDEV
(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
@@
-348,7
+346,7
@@
static void send_file_entry(struct file_struct *file, int f)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
} else if (protocol_version < 28)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
} else if (protocol_version < 28)
- rdev =
makedev
(0, 0);
+ rdev =
MAKEDEV
(0, 0);
if (file->uid == uid)
flags |= XMIT_SAME_UID;
else
if (file->uid == uid)
flags |= XMIT_SAME_UID;
else
@@
-499,7
+497,7
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
if (!flist) {
modtime = 0, mode = 0;
if (!flist) {
modtime = 0, mode = 0;
- dev = 0, rdev =
makedev
(0, 0);
+ dev = 0, rdev =
MAKEDEV
(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
@@
-532,7
+530,7
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
clean_fname(thisname, 0);
if (sanitize_paths)
clean_fname(thisname, 0);
if (sanitize_paths)
- sanitize_path(thisname, thisname, "", 0);
+ sanitize_path(thisname, thisname, "", 0
, NULL
);
if ((basename = strrchr(thisname, '/')) != NULL) {
dirname_len = ++basename - thisname; /* counts future '\0' */
if ((basename = strrchr(thisname, '/')) != NULL) {
dirname_len = ++basename - thisname; /* counts future '\0' */
@@
-576,10
+574,10
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
rdev_minor = read_byte(f);
else
rdev_minor = read_int(f);
rdev_minor = read_byte(f);
else
rdev_minor = read_int(f);
- rdev =
makedev
(rdev_major, rdev_minor);
+ rdev =
MAKEDEV
(rdev_major, rdev_minor);
}
} else if (protocol_version < 28)
}
} else if (protocol_version < 28)
- rdev =
makedev
(0, 0);
+ rdev =
MAKEDEV
(0, 0);
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
@@
-657,6
+655,8
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
if (linkname_len) {
file->u.link = bp;
read_sbuf(f, bp, linkname_len - 1);
if (linkname_len) {
file->u.link = bp;
read_sbuf(f, bp, linkname_len - 1);
+ if (sanitize_paths)
+ sanitize_path(bp, bp, "", lastdir_depth, NULL);
bp += linkname_len;
}
#endif
bp += linkname_len;
}
#endif
@@
-737,7
+737,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
}
clean_fname(thisname, 0);
if (sanitize_paths)
}
clean_fname(thisname, 0);
if (sanitize_paths)
- sanitize_path(thisname, thisname, "", 0);
+ sanitize_path(thisname, thisname, "", 0
, NULL
);
memset(sum, 0, SUM_LENGTH);
memset(sum, 0, SUM_LENGTH);
@@
-1060,6
+1060,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
int64 start_write;
int use_ff_fd = 0;
int64 start_write;
int use_ff_fd = 0;
+ rprintf(FLOG, "building file list\n");
if (show_filelist_p())
start_filelist_progress("building file list");
if (show_filelist_p())
start_filelist_progress("building file list");
@@
-1070,7
+1071,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
io_start_buffering_out();
if (filesfrom_fd >= 0) {
io_start_buffering_out();
if (filesfrom_fd >= 0) {
- if (argv[0] && !push_dir(argv[0])) {
+ if (argv[0] && !push_dir(argv[0]
, 0
)) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
exit_cleanup(RERR_FILESELECT);
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
exit_cleanup(RERR_FILESELECT);
@@
-1086,13
+1087,13
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
if (use_ff_fd) {
if (read_filesfrom_line(filesfrom_fd, fbuf) == 0)
break;
if (use_ff_fd) {
if (read_filesfrom_line(filesfrom_fd, fbuf) == 0)
break;
- sanitize_path(fbuf, fbuf, "", 0);
+ sanitize_path(fbuf, fbuf, "", 0
, NULL
);
} else {
if (argc-- == 0)
break;
strlcpy(fbuf, *argv++, MAXPATHLEN);
if (sanitize_paths)
} else {
if (argc-- == 0)
break;
strlcpy(fbuf, *argv++, MAXPATHLEN);
if (sanitize_paths)
- sanitize_path(fbuf, fbuf, "", 0);
+ sanitize_path(fbuf, fbuf, "", 0
, NULL
);
}
len = strlen(fbuf);
}
len = strlen(fbuf);
@@
-1180,6
+1181,8
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
} else
break;
}
} else
break;
}
+ if (len == 1 && fn[0] == '/')
+ fn[len++] = '.';
fn[len] = '\0';
/* Reject a ".." dir in the active part of the path. */
for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
fn[len] = '\0';
/* Reject a ".." dir in the active part of the path. */
for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
@@
-1204,7
+1207,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
strlcpy(olddir, curr_dir, sizeof olddir);
strlcpy(olddir, curr_dir, sizeof olddir);
- if (!push_dir(dir)) {
+ if (!push_dir(dir
, 0
)) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(dir));
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(dir));
@@
-1326,6
+1329,7
@@
struct file_list *recv_file_list(int f)
unsigned short flags;
int64 start_read;
unsigned short flags;
int64 start_read;
+ rprintf(FLOG, "receiving file list\n");
if (show_filelist_p())
start_filelist_progress("receiving file list");
if (show_filelist_p())
start_filelist_progress("receiving file list");