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
Only call cleanup_set() if keep_partial is set.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
18156eb
..
aa46f98
100644
(file)
--- a/
main.c
+++ b/
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 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;
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 *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
-extern char curr_dir[MAXPATHLEN];
int local_server = 0;
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,
struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
@@
-398,7
+395,7
@@
static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
return ret;
return ret;
-oom:
+
oom:
out_of_memory("do_cmd");
return 0; /* not reached */
}
out_of_memory("do_cmd");
return 0; /* not reached */
}
@@
-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;
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
- char olddir[sizeof curr_dir];
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
@@
-656,7
+652,6
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
return;
}
return;
}
-
if (argc > 0) {
dir = argv[0];
argc--;
if (argc > 0) {
dir = argv[0];
argc--;
@@
-681,10
+676,6
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
filesfrom_fd = -1;
}
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) {
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
@@
-693,9
+684,6
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
the_file_list = flist;
}
the_file_list = flist;
- if (pre_checksum)
- pop_dir(olddir);
-
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
@@
-744,7
+732,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;
{
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;
char *local_name = NULL;
cleanup_child_pid = pid;
@@
-816,18
+803,11
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
filesfrom_fd = -1;
}
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 (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]);
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);