mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-05-24 23:05:52 -04:00
Got rid of some early-checksum code that accidentally got committed.
This commit is contained in:
19
main.c
19
main.c
@@ -45,7 +45,6 @@ extern int copy_links;
|
||||
extern int keep_dirlinks;
|
||||
extern int preserve_hard_links;
|
||||
extern int protocol_version;
|
||||
extern int always_checksum;
|
||||
extern int recurse;
|
||||
extern int relative_paths;
|
||||
extern int rsync_port;
|
||||
@@ -61,10 +60,8 @@ extern char *filesfrom_host;
|
||||
extern char *rsync_path;
|
||||
extern char *shell_cmd;
|
||||
extern char *batch_name;
|
||||
extern char curr_dir[MAXPATHLEN];
|
||||
|
||||
int local_server = 0;
|
||||
int pre_checksum = 0;
|
||||
struct file_list *the_file_list;
|
||||
|
||||
/* There's probably never more than at most 2 outstanding child processes,
|
||||
@@ -636,7 +633,6 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
|
||||
struct file_list *flist;
|
||||
char *local_name = NULL;
|
||||
char *dir = NULL;
|
||||
char olddir[sizeof curr_dir];
|
||||
int save_verbose = verbose;
|
||||
|
||||
if (filesfrom_fd >= 0) {
|
||||
@@ -681,10 +677,6 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
|
||||
filesfrom_fd = -1;
|
||||
}
|
||||
|
||||
strlcpy(olddir, curr_dir, sizeof olddir);
|
||||
if (always_checksum && argc > 0)
|
||||
pre_checksum = push_dir(argv[0]);
|
||||
|
||||
flist = recv_file_list(f_in);
|
||||
verbose = save_verbose;
|
||||
if (!flist) {
|
||||
@@ -693,9 +685,6 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
|
||||
}
|
||||
the_file_list = flist;
|
||||
|
||||
if (pre_checksum)
|
||||
pop_dir(olddir);
|
||||
|
||||
if (argc > 0)
|
||||
local_name = get_local_name(flist,argv[0]);
|
||||
|
||||
@@ -744,7 +733,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
|
||||
{
|
||||
struct file_list *flist = NULL;
|
||||
int exit_code = 0, exit_code2 = 0;
|
||||
char olddir[sizeof curr_dir];
|
||||
char *local_name = NULL;
|
||||
|
||||
cleanup_child_pid = pid;
|
||||
@@ -816,18 +804,11 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
|
||||
filesfrom_fd = -1;
|
||||
}
|
||||
|
||||
strlcpy(olddir, curr_dir, sizeof olddir);
|
||||
if (always_checksum)
|
||||
pre_checksum = push_dir(argv[0]);
|
||||
|
||||
if (write_batch && !am_server)
|
||||
start_write_batch(f_in);
|
||||
flist = recv_file_list(f_in);
|
||||
the_file_list = flist;
|
||||
|
||||
if (pre_checksum)
|
||||
pop_dir(olddir);
|
||||
|
||||
if (flist && flist->count > 0) {
|
||||
local_name = get_local_name(flist, argv[0]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user