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
Mention the latest --log-* option changes.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
32e51a7
..
ad859bc
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)
@@
-149,61
+149,53
@@
static void list_file_entry(struct file_struct *f)
}
}
}
}
-/**
- * Stat either a symlink or its referent, depending on the settings of
- * copy_links, copy_unsafe_links, etc.
- *
- * @retval -1 on error
- *
- * @retval 0 for success
+/* Stat either a symlink or its referent, depending on the settings of
+ * copy_links, copy_unsafe_links, etc. Returns -1 on error, 0 on success.
*
*
- *
@post If @p path is a symlink, then @p linkbuf (of size @c
- * MAXPATHLEN
) contains the symlink target
.
+ *
If path is the name of a symlink, then the linkbuf buffer (which must hold
+ * MAXPATHLEN
chars) will be set to the symlink's target string
.
*
*
- * @post @p buffer contains information about the link or the
- * referrent as appropriate, if they exist.
- **/
-static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
+ * The stat structure pointed to by stp will contain information about the
+ * link or the referent as appropriate, if they exist. */
+static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf)
{
#ifdef SUPPORT_LINKS
{
#ifdef SUPPORT_LINKS
- if (copy_links)
- return do_stat(path, buffer);
- if (link_stat(path, buffer, copy_dirlinks) < 0)
+ if (link_stat(path, stp, copy_dirlinks) < 0)
return -1;
return -1;
- if (S_ISLNK(
buffer
->st_mode)) {
- int l
= readlink((char *)
path, linkbuf, MAXPATHLEN - 1);
- if (l
== -1
)
+ if (S_ISLNK(
stp
->st_mode)) {
+ int l
len = readlink(
path, linkbuf, MAXPATHLEN - 1);
+ if (l
len < 0
)
return -1;
return -1;
- linkbuf[l
] = 0
;
+ linkbuf[l
len] = '\0'
;
if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
if (verbose > 1) {
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
path, linkbuf);
}
if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
if (verbose > 1) {
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
path, linkbuf);
}
- return
do_stat(path, buffer
);
+ return
safe_stat(path, stp
);
}
}
return 0;
#else
}
}
return 0;
#else
- return do_stat(path,
buffer
);
+ return do_stat(path,
stp
);
#endif
}
#endif
}
-int link_stat(const char *path, STRUCT_STAT *
buffer
, int follow_dirlinks)
+int link_stat(const char *path, STRUCT_STAT *
stp
, int follow_dirlinks)
{
#ifdef SUPPORT_LINKS
if (copy_links)
{
#ifdef SUPPORT_LINKS
if (copy_links)
- return
do_stat(path, buffer
);
- if (do_lstat(path,
buffer
) < 0)
+ return
safe_stat(path, stp
);
+ if (do_lstat(path,
stp
) < 0)
return -1;
return -1;
- if (follow_dirlinks && S_ISLNK(
buffer
->st_mode)) {
+ if (follow_dirlinks && S_ISLNK(
stp
->st_mode)) {
STRUCT_STAT st;
STRUCT_STAT st;
- if (
do
_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
- *
buffer
= st;
+ if (
safe
_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+ *
stp
= st;
}
return 0;
#else
}
return 0;
#else
- return do_stat(path,
buffer
);
+ return do_stat(path,
stp
);
#endif
}
#endif
}
@@
-290,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" : "");
@@
-538,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' */
@@
-743,7
+735,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);
@@
-847,7
+839,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
? MD4_SUM_LENGTH : 0;
alloc_len = file_struct_len + dirname_len + basename_len
? MD4_SUM_LENGTH : 0;
alloc_len = file_struct_len + dirname_len + basename_len
- + linkname_len + sum_len;
+
+ linkname_len + sum_len;
if (flist)
bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
else {
if (flist)
bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
else {
@@
-928,7
+920,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
int save_mode = file->mode;
file->mode = S_IFDIR; /* Find a directory with our name. */
if (flist_find(the_file_list, file) >= 0
int save_mode = file->mode;
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)) {
+ &&
safe
_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->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
@@
-1066,6
+1058,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");
@@
-1076,6
+1069,8
@@
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 (sanitize_paths)
+ die_on_unsafe_path(argv[0], 0);
if (argv[0] && !push_dir(argv[0])) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
if (argv[0] && !push_dir(argv[0])) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
@@
-1092,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);
@@
-1129,6
+1124,8
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
&& (len == 1 || fbuf[len-2] == '/');
}
&& (len == 1 || fbuf[len-2] == '/');
}
+ if (sanitize_paths)
+ die_on_unsafe_path(fbuf, 1);
if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
@@
-1332,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");