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
The print_child_argv() function should be outputting FCLIENT
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
3c6cb4c
..
ad859bc
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-37,7
+37,6
@@
extern int numeric_ids;
extern int recurse;
extern int xfer_dirs;
extern int filesfrom_fd;
extern int recurse;
extern int xfer_dirs;
extern int filesfrom_fd;
-extern int curr_dir_depth;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
@@
-91,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)
@@
-283,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" : "");
@@
-1059,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");
@@
-1069,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]));
@@
-1122,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",
@@
-1325,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");