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
Added parsing for --delete-delay.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
eed9c0f
..
31d2faa
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-72,6
+72,7
@@
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
int local_server = 0;
extern struct filter_list_struct server_filter_list;
int local_server = 0;
+int new_root_dir = 0;
mode_t orig_umask = 0;
struct file_list *the_file_list;
mode_t orig_umask = 0;
struct file_list *the_file_list;
@@
-237,7
+238,8
@@
static void output_summary(void)
human_num(stats.literal_data));
rprintf(FINFO,"Matched data: %s bytes\n",
human_num(stats.matched_data));
human_num(stats.literal_data));
rprintf(FINFO,"Matched data: %s bytes\n",
human_num(stats.matched_data));
- rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+ rprintf(FINFO,"File list size: %s\n",
+ human_num(stats.flist_size));
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list generation time: %.3f seconds\n",
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list generation time: %.3f seconds\n",
@@
-476,11
+478,9
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
return NULL;
/* See what currently exists at the destination. */
return NULL;
/* See what currently exists at the destination. */
- if ((statret =
safe
_stat(dest_path, &st)) == 0) {
+ if ((statret =
do
_stat(dest_path, &st)) == 0) {
/* If the destination is a dir, enter it and use mode 1. */
if (S_ISDIR(st.st_mode)) {
/* If the destination is a dir, enter it and use mode 1. */
if (S_ISDIR(st.st_mode)) {
- if (sanitize_paths)
- die_on_unsafe_path(dest_path, 0);
if (!push_dir(dest_path, 0)) {
rsyserr(FERROR, errno, "push_dir#1 %s failed",
full_fname(dest_path));
if (!push_dir(dest_path, 0)) {
rsyserr(FERROR, errno, "push_dir#1 %s failed",
full_fname(dest_path));
@@
-488,8
+488,6
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
}
return NULL;
}
}
return NULL;
}
- if (sanitize_paths && S_ISLNK(st.st_mode))
- die_on_unsafe_path(dest_path, 0);
if (flist->count > 1) {
rprintf(FERROR,
"ERROR: destination must be a directory when"
if (flist->count > 1) {
rprintf(FERROR,
"ERROR: destination must be a directory when"
@@
-532,6
+530,8
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
+ new_root_dir = 1;
+
if (verbose)
rprintf(FINFO, "created directory %s\n", dest_path);
if (verbose)
rprintf(FINFO, "created directory %s\n", dest_path);
@@
-540,8
+540,6
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
dry_run++;
}
dry_run++;
}
- if (sanitize_paths)
- die_on_unsafe_path(dest_path, 0);
if (!push_dir(dest_path, dry_run > 1)) {
rsyserr(FERROR, errno, "push_dir#2 %s failed",
full_fname(dest_path));
if (!push_dir(dest_path, dry_run > 1)) {
rsyserr(FERROR, errno, "push_dir#2 %s failed",
full_fname(dest_path));
@@
-562,8
+560,6
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
dest_path = "/";
*cp = '\0';
dest_path = "/";
*cp = '\0';
- if (sanitize_paths)
- die_on_unsafe_path(dest_path, 0);
if (!push_dir(dest_path, 0)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
full_fname(dest_path));
if (!push_dir(dest_path, 0)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
full_fname(dest_path));
@@
-655,8
+651,6
@@
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
}
if (!relative_paths) {
}
if (!relative_paths) {
- if (sanitize_paths)
- die_on_unsafe_path(dir, 0);
if (!push_dir(dir, 0)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
full_fname(dir));
if (!push_dir(dir, 0)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
full_fname(dir));
@@
-851,13
+845,9
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
char **dir;
for (dir = basis_dir; *dir; dir++) {
*dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth, NULL);
char **dir;
for (dir = basis_dir; *dir; dir++) {
*dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth, NULL);
- die_on_unsafe_path(*dir, 0);
}
if (partial_dir) {
partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, NULL);
}
if (partial_dir) {
partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, NULL);
- /* A relative path gets this checked at every dir change. */
- if (*partial_dir == '/')
- die_on_unsafe_path(partial_dir, 0);
}
}
fix_basis_dirs();
}
}
fix_basis_dirs();
@@
-1269,8
+1259,8
@@
static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
char cmd_buf[300];
int ret;
char cmd_buf[300];
int ret;
- s
printf(
cmd_buf, get_panic_action(),
- getpid(), getpid());
+ s
nprintf(cmd_buf, sizeof
cmd_buf, get_panic_action(),
+
getpid(), getpid());
/* Unless we failed to execute gdb, we allow the process to
* continue. I'm not sure if that's right. */
/* Unless we failed to execute gdb, we allow the process to
* continue. I'm not sure if that's right. */