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
Got rid of the disable_deltas_p() function (the whole_file value
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
03133cf
..
0ec6dee
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-43,11
+43,13
@@
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;
+extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
extern int relative_paths;
extern int rsync_port;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
extern int relative_paths;
extern int rsync_port;
+extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int filesfrom_fd;
extern int read_batch;
extern int write_batch;
extern int filesfrom_fd;
@@
-84,7
+86,7
@@
void wait_process(pid_t pid, int *status)
io_flush(FULL_FLUSH);
}
io_flush(FULL_FLUSH);
}
- if (
(waited_pid == -1) && (errno == ECHILD)
) {
+ if (
waited_pid == -1 && errno == ECHILD
) {
/* status of requested child no longer available.
* check to see if it was processed by the sigchld_handler.
*/
/* status of requested child no longer available.
* check to see if it was processed by the sigchld_handler.
*/
@@
-108,7
+110,6
@@
void wait_process(pid_t pid, int *status)
static void report(int f)
{
time_t t = time(NULL);
static void report(int f)
{
time_t t = time(NULL);
- int send_stats;
if (do_stats && verbose > 1) {
/* These come out from every process */
if (do_stats && verbose > 1) {
/* These come out from every process */
@@
-116,14
+117,17
@@
static void report(int f)
show_flist_stats();
}
show_flist_stats();
}
+ if (am_generator)
+ return;
+
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
- if (f == -1 || !am_sender) return;
+ if (f == -1 || !am_sender)
+ return;
}
}
- send_stats = verbose || protocol_version >= 20;
if (am_server) {
if (am_server) {
- if (am_sender
&& send_stats
) {
+ if (am_sender) {
int64 w;
/* store total_written in a temporary
* because write_longint changes it */
int64 w;
/* store total_written in a temporary
* because write_longint changes it */
@@
-137,7
+141,7
@@
static void report(int f)
/* this is the client */
/* this is the client */
- if (!am_sender
&& send_stats
) {
+ if (!am_sender) {
int64 r;
stats.total_written = read_longint(f);
/* store total_read in a temporary, read_longint changes it */
int64 r;
stats.total_written = read_longint(f);
/* store total_read in a temporary, read_longint changes it */
@@
-147,12
+151,6
@@
static void report(int f)
}
if (do_stats) {
}
if (do_stats) {
- if (!am_sender && !send_stats) {
- /* missing the bytes written by the generator */
- rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n");
- rprintf(FINFO, "Use --stats -v to show stats\n");
- return;
- }
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
stats.num_transferred_files);
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
stats.num_transferred_files);
@@
-206,6
+204,8
@@
static void show_malloc_stats(void)
rprintf(FINFO, " smblks: %10d\n", mi.smblks);
rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks);
rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd);
rprintf(FINFO, " smblks: %10d\n", mi.smblks);
rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks);
rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd);
+ rprintf(FINFO, " allmem: %10d (bytes from sbrk + mmap)\n",
+ mi.arena + mi.hblkhd);
rprintf(FINFO, " usmblks: %10d\n", mi.usmblks);
rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks);
rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks);
rprintf(FINFO, " usmblks: %10d\n", mi.usmblks);
rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks);
rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks);
@@
-216,12
+216,13
@@
static void show_malloc_stats(void)
/* Start the remote shell. cmd may be NULL to use the default. */
/* Start the remote shell. cmd may be NULL to use the default. */
-static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
+ int *f_in, int *f_out)
{
{
-
char *args[100]
;
-
int i,argc=0
;
+
int i, argc = 0
;
+
char *args[MAX_ARGS]
;
pid_t ret;
pid_t ret;
- char *tok,
*dir=
NULL;
+ char *tok,
*dir =
NULL;
int dash_l_set = 0;
if (!read_batch && !local_server) {
int dash_l_set = 0;
if (!read_batch && !local_server) {
@@
-234,7
+235,12
@@
static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
if (!cmd)
goto oom;
if (!cmd)
goto oom;
- for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
+ for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
+ /* Comparison leaves rooms for server_options(). */
+ if (argc >= MAX_ARGS - 100) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
args[argc++] = tok;
}
args[argc++] = tok;
}
@@
-273,6
+279,11
@@
static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
}
server_options(args,&argc);
}
server_options(args,&argc);
+
+ if (argc >= MAX_ARGS - 2) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
}
args[argc++] = ".";
}
args[argc++] = ".";
@@
-284,7
+295,7
@@
static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
if (verbose > 3) {
rprintf(FINFO,"cmd=");
if (verbose > 3) {
rprintf(FINFO,"cmd=");
- for (i
=0;i<argc;
i++)
+ for (i
= 0; i < argc;
i++)
rprintf(FINFO,"%s ",args[i]);
rprintf(FINFO,"\n");
}
rprintf(FINFO,"%s ",args[i]);
rprintf(FINFO,"\n");
}
@@
-292,12
+303,17
@@
static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
if (local_server) {
if (read_batch)
create_flist_from_batch(); /* sets batch_flist */
if (local_server) {
if (read_batch)
create_flist_from_batch(); /* sets batch_flist */
+ /* If the user didn't request --[no-]whole-file, force
+ * it on, but only if we're not batch processing. */
+ if (whole_file < 0 && !read_batch && !write_batch)
+ whole_file = 1;
ret = local_child(argc, args, f_in, f_out, child_main);
} else {
ret = piped_child(args,f_in,f_out);
}
ret = local_child(argc, args, f_in, f_out, child_main);
} else {
ret = piped_child(args,f_in,f_out);
}
- if (dir) free(dir);
+ if (dir)
+ free(dir);
return ret;
return ret;
@@
-322,8
+338,8
@@
static char *get_local_name(struct file_list *flist,char *name)
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name)) {
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name)) {
- r
printf(FERROR, "push_dir %s failed: %s (1)\n
",
- full_fname(name)
, strerror(errno)
);
+ r
syserr(FERROR, errno, "push_dir#1 %s failed
",
+ full_fname(name));
exit_cleanup(RERR_FILESELECT);
}
return NULL;
exit_cleanup(RERR_FILESELECT);
}
return NULL;
@@
-339,8
+355,7
@@
static char *get_local_name(struct file_list *flist,char *name)
return name;
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
return name;
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
- rprintf(FERROR, "mkdir %s failed: %s\n",
- full_fname(name), strerror(errno));
+ rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
@@
-348,8
+363,8
@@
static char *get_local_name(struct file_list *flist,char *name)
}
if (!push_dir(name)) {
}
if (!push_dir(name)) {
- r
printf(FERROR, "push_dir %s failed: %s (2)\n
",
- full_fname(name)
, strerror(errno)
);
+ r
syserr(FERROR, errno, "push_dir#2 %s failed
",
+ full_fname(name));
exit_cleanup(RERR_FILESELECT);
}
exit_cleanup(RERR_FILESELECT);
}
@@
-368,9
+383,15
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
(long)getpid());
}
(long)getpid());
}
+ if (am_daemon && lp_write_only(module_id) && am_sender) {
+ rprintf(FERROR, "ERROR: module is write only\n");
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
+
if (!relative_paths && !push_dir(dir)) {
if (!relative_paths && !push_dir(dir)) {
- r
printf(FERROR, "push_dir %s failed: %s (3)\n
",
- full_fname(dir)
, strerror(errno)
);
+ r
syserr(FERROR, errno, "push_dir#3 %s failed
",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
argc--;
exit_cleanup(RERR_FILESELECT);
}
argc--;
@@
-380,12
+401,12
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
int l = strlen(dir);
if (strcmp(dir,"/") == 0)
l = 0;
int l = strlen(dir);
if (strcmp(dir,"/") == 0)
l = 0;
- for (i
=0;i<argc;
i++)
+ for (i
= 0; i < argc;
i++)
argv[i] += l+1;
}
if (argc == 0 && recurse) {
argv[i] += l+1;
}
if (argc == 0 && recurse) {
- argc
=
1;
+ argc
=
1;
argv--;
argv[0] = ".";
}
argv--;
argv[0] = ".";
}
@@
-412,7
+433,7
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
- int status
=
0;
+ int status
=
0;
int error_pipe[2];
if (preserve_hard_links)
int error_pipe[2];
if (preserve_hard_links)
@@
-432,9
+453,10
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
io_flush(NORMAL_FLUSH);
io_flush(NORMAL_FLUSH);
- if ((pid
=
do_fork()) == 0) {
+ if ((pid
=
do_fork()) == 0) {
close(error_pipe[0]);
close(error_pipe[0]);
- if (f_in != f_out) close(f_out);
+ if (f_in != f_out)
+ close(f_out);
/* we can't let two processes write to the socket at one time */
io_multiplexing_close();
/* we can't let two processes write to the socket at one time */
io_multiplexing_close();
@@
-458,7
+480,8
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
am_generator = 1;
close(error_pipe[1]);
am_generator = 1;
close(error_pipe[1]);
- if (f_in != f_out) close(f_in);
+ if (f_in != f_out)
+ close(f_in);
io_start_buffering_out(f_out);
io_start_buffering_out(f_out);
@@
-467,6
+490,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
generate_files(f_out, flist, local_name);
get_redo_num(); /* Read final MSG_DONE and any prior messages. */
generate_files(f_out, flist, local_name);
get_redo_num(); /* Read final MSG_DONE and any prior messages. */
+ report(-1);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
@@
-485,7
+509,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int status;
struct file_list *flist;
{
int status;
struct file_list *flist;
- char *local_name
=
NULL;
+ char *local_name
=
NULL;
char *dir = NULL;
if (verbose > 2) {
char *dir = NULL;
if (verbose > 2) {
@@
-505,8
+529,8
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
argc--;
argv++;
if (!am_daemon && !push_dir(dir)) {
argc--;
argv++;
if (!am_daemon && !push_dir(dir)) {
- r
printf(FERROR, "push_dir %s failed: %s (4)\n
",
- full_fname(dir)
, strerror(errno)
);
+ r
syserr(FERROR, errno, "push_dir#4 %s failed
",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
}
exit_cleanup(RERR_FILESELECT);
}
}
@@
-536,7
+560,8
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
if (argc > 0) {
if (strcmp(dir,".")) {
argv[0] += strlen(dir);
if (argc > 0) {
if (strcmp(dir,".")) {
argv[0] += strlen(dir);
- if (argv[0][0] == '/') argv[0]++;
+ if (argv[0][0] == '/')
+ argv[0]++;
}
local_name = get_local_name(flist,argv[0]);
}
}
local_name = get_local_name(flist,argv[0]);
}
@@
-564,6
+589,7
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
io_start_multiplex_out(f_out);
if (am_sender) {
io_start_multiplex_out(f_out);
if (am_sender) {
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
if (!read_batch) {
recv_exclude_list(f_in);
if (cvs_exclude)
if (!read_batch) {
recv_exclude_list(f_in);
if (cvs_exclude)
@@
-600,6
+626,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_start_multiplex_in(f_in);
if (am_sender) {
io_start_multiplex_in(f_in);
if (am_sender) {
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
io_start_buffering_out(f_out);
if (cvs_exclude)
add_cvs_excludes();
io_start_buffering_out(f_out);
if (cvs_exclude)
add_cvs_excludes();
@@
-630,11
+657,10
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
exit_cleanup(status);
}
exit_cleanup(status);
}
- if (argc == 0)
{
+ if (argc == 0)
list_only = 1;
list_only = 1;
- }
- if (!
write
_batch)
+ if (!
read
_batch)
send_exclude_list(f_out);
if (filesfrom_fd >= 0) {
send_exclude_list(f_out);
if (filesfrom_fd >= 0) {
@@
-724,9
+750,9
@@
static int start_client(int argc, char *argv[])
return start_socket_client(host, path, argc-1, argv+1);
}
return start_socket_client(host, path, argc-1, argv+1);
}
- if (!read_batch) {
+ if (!read_batch) {
/* for read_batch, NO source is specified */
p = find_colon(argv[0]);
p = find_colon(argv[0]);
- if (p) {
+ if (p) {
/* source is remote */
if (remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
if (remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
@@
-744,7
+770,7
@@
static int start_client(int argc, char *argv[])
daemon_over_rsh = 1;
}
daemon_over_rsh = 1;
}
- if (argc < 1) {
+ if (argc < 1) {
/* destination required */
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
@@
-753,9
+779,8
@@
static int start_client(int argc, char *argv[])
*p = 0;
shell_machine = argv[0];
shell_path = p+1;
*p = 0;
shell_machine = argv[0];
shell_path = p+1;
- argc--;
argv++;
argv++;
- } else {
+ } else {
/* source is local */
am_sender = 1;
/* rsync:// destination uses rsync server over direct socket */
am_sender = 1;
/* rsync:// destination uses rsync server over direct socket */
@@
-778,7
+803,7
@@
static int start_client(int argc, char *argv[])
return start_socket_client(host, path, argc-1, argv);
}
return start_socket_client(host, path, argc-1, argv);
}
- p = find_colon(argv[argc-1]);
+ p = find_colon(argv[argc-1]);
/* look in dest arg */
if (p && remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
if (p && remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
@@
-786,7
+811,7
@@
static int start_client(int argc, char *argv[])
"--files-from hostname is not transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
"--files-from hostname is not transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (!p) {
+ if (!p) {
/* no colon found, so src & dest are local */
local_server = 1;
if (remote_filesfrom_file) {
rprintf(FERROR,
local_server = 1;
if (remote_filesfrom_file) {
rprintf(FERROR,
@@
-816,9
+841,9
@@
static int start_client(int argc, char *argv[])
shell_machine = argv[argc-1];
shell_path = p+1;
}
shell_machine = argv[argc-1];
shell_path = p+1;
}
- argc--;
}
}
- } else {
+ argc--;
+ } else { /* read_batch */
am_sender = 1;
local_server = 1;
shell_path = argv[argc-1];
am_sender = 1;
local_server = 1;
shell_path = argv[argc-1];
@@
-841,12
+866,14
@@
static int start_client(int argc, char *argv[])
shell_path?shell_path:"");
}
shell_path?shell_path:"");
}
+ /* for remote source, only single dest arg can remain ... */
if (!am_sender && argc > 1) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
if (!am_sender && argc > 1) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- if (argc == 0 && !am_sender) {
+ /* ... or no dest at all */
+ if (!am_sender && argc == 0) {
list_only = 1;
}
list_only = 1;
}
@@
-979,7
+1006,7
@@
int main(int argc,char *argv[])
#endif /* def MAINTAINER_MODE */
starttime = time(NULL);
#endif /* def MAINTAINER_MODE */
starttime = time(NULL);
- am_root = (
getuid
() == 0);
+ am_root = (
MY_UID
() == 0);
memset(&stats, 0, sizeof(stats));
memset(&stats, 0, sizeof(stats));