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
Adding more calls to safe_fname().
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
d889a12
..
02bee6b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-31,16
+31,11
@@
extern int am_generator;
extern int am_daemon;
extern int verbose;
extern int blocking_io;
extern int am_daemon;
extern int verbose;
extern int blocking_io;
-extern int cvs_exclude;
-extern int delete_mode;
extern int delete_before;
extern int delete_before;
-extern int delete_after;
-extern int delete_excluded;
extern int daemon_over_rsh;
extern int do_stats;
extern int dry_run;
extern int list_only;
extern int daemon_over_rsh;
extern int do_stats;
extern int dry_run;
extern int list_only;
-extern int local_server;
extern int log_got_error;
extern int module_id;
extern int orig_umask;
extern int log_got_error;
extern int module_id;
extern int orig_umask;
@@
-66,10
+61,10
@@
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
extern char *shell_cmd;
extern char *batch_name;
+int local_server = 0;
-/* there's probably never more than at most 2 outstanding child processes,
- * but set it higher just in case.
- */
+/* There's probably never more than at most 2 outstanding child processes,
+ * but set it higher, just in case. */
#define MAXCHILDPROCS 5
struct pid_status {
#define MAXCHILDPROCS 5
struct pid_status {
@@
-502,10
+497,9
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (preserve_hard_links)
init_hard_links(flist);
if (preserve_hard_links)
init_hard_links(flist);
- if (delete_before) {
- /* I moved this here from recv_files() to prevent a race condition */
- if (recurse && !local_name && flist->count > 0)
- delete_files(flist);
+ if (delete_before && !local_name && flist->count > 0) {
+ /* Moved here from recv_files() to prevent a race condition */
+ delete_files(flist);
}
if (fd_pair(error_pipe) < 0
}
if (fd_pair(error_pipe) < 0
@@
-623,10
+617,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
io_start_buffering_in();
}
io_start_buffering_in();
- if (delete_mode && !delete_excluded)
- recv_filter_list(f_in);
- if (cvs_exclude)
- add_cvs_excludes();
+ recv_filter_list(f_in);
if (filesfrom_fd >= 0) {
/* We need to send the files-from names to the sender at the
if (filesfrom_fd >= 0) {
/* We need to send the files-from names to the sender at the
@@
-681,8
+672,6
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
keep_dirlinks = 0; /* Must be disabled on the sender. */
recv_filter_list(f_in);
keep_dirlinks = 0; /* Must be disabled on the sender. */
recv_filter_list(f_in);
- if (cvs_exclude)
- add_cvs_excludes();
do_server_sender(f_in, f_out, argc, argv);
} else {
do_server_recv(f_in, f_out, argc, argv);
do_server_sender(f_in, f_out, argc, argv);
} else {
do_server_recv(f_in, f_out, argc, argv);
@@
-728,10
+717,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_start_buffering_out();
if (!remote_filesfrom_file)
set_msg_fd_in(f_in);
io_start_buffering_out();
if (!remote_filesfrom_file)
set_msg_fd_in(f_in);
- if (cvs_exclude)
- add_cvs_excludes();
- if (delete_mode && !delete_excluded)
- send_filter_list(f_out);
+ send_filter_list(f_out);
if (remote_filesfrom_file)
filesfrom_fd = f_in;
if (remote_filesfrom_file)
filesfrom_fd = f_in;
@@
-764,10
+750,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (argc == 0)
list_only |= 1;
if (argc == 0)
list_only |= 1;
- if (!read_batch)
- send_filter_list(f_out);
- if (cvs_exclude)
- add_cvs_excludes();
+ send_filter_list(read_batch ? -1 : f_out);
if (filesfrom_fd >= 0) {
io_set_filesfrom_fds(filesfrom_fd, f_out);
if (filesfrom_fd >= 0) {
io_set_filesfrom_fds(filesfrom_fd, f_out);