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
need a ifdef around some mmap code
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
f914f3e
..
67ece95
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-34,14
+34,17
@@
static void report(int f)
extern int am_sender;
extern int am_daemon;
extern int am_sender;
extern int am_daemon;
- if (!verbose) return;
-
if (am_daemon) {
if (am_daemon) {
- rprintf(FINFO, "wrote %.0f bytes read %.0f bytes total size %.0f\n",
- (double)write_total(),(double)read_total(),
- (double)total_size);
+ syslog(LOG_INFO,"wrote %.0f bytes read %.0f bytes total size %.0f\n",
+ (double)write_total(),(double)read_total(),
+ (double)total_size);
+ if (f == -1 || !am_sender) return;
}
}
+ if (!verbose) return;
+
+ if (am_server && !am_sender) return;
+
if (am_server && am_sender) {
write_longint(f,read_total());
write_longint(f,write_total());
if (am_server && am_sender) {
write_longint(f,read_total());
write_longint(f,write_total());
@@
-190,7
+193,6
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
struct file_list *flist;
char *dir = argv[0];
extern int relative_paths;
struct file_list *flist;
char *dir = argv[0];
extern int relative_paths;
- extern int am_daemon;
extern int recurse;
if (verbose > 2)
extern int recurse;
if (verbose > 2)
@@
-218,40
+220,56
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
}
flist = send_file_list(f_out,argc,argv);
}
flist = send_file_list(f_out,argc,argv);
+ if (!flist || flist->count == 0) {
+ exit_cleanup(0);
+ }
+
send_files(flist,f_out,f_in);
report(f_out);
send_files(flist,f_out,f_in);
report(f_out);
+ io_flush();
exit_cleanup(0);
}
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
exit_cleanup(0);
}
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
- int pid;
- int status=0;
- int recv_pipe[2];
- extern int preserve_hard_links;
+
int pid;
+
int status=0;
+
int recv_pipe[2];
+
extern int preserve_hard_links;
- if (preserve_hard_links)
- init_hard_links(flist);
+
if (preserve_hard_links)
+
init_hard_links(flist);
- if (pipe(recv_pipe) < 0) {
- rprintf(FERROR,"pipe failed in do_recv\n");
-
exit
(1);
- }
+
if (pipe(recv_pipe) < 0) {
+
rprintf(FERROR,"pipe failed in do_recv\n");
+
exit_cleanup
(1);
+
}
+ io_flush();
- if ((pid=do_fork()) == 0) {
- recv_files(f_in,flist,local_name,recv_pipe[1]);
- if (verbose > 2)
- rprintf(FINFO,"receiver read %ld\n",(long)read_total());
- exit_cleanup(0);
- }
+ if ((pid=do_fork()) == 0) {
+ close(recv_pipe[0]);
+ if (f_in != f_out) close(f_out);
- generate_files(f_out,flist,local_name,recv_pipe[0]);
+ recv_files(f_in,flist,local_name,recv_pipe[1]);
+ report(f_in);
+
+ if (verbose > 3)
+ rprintf(FINFO,"do_recv waiting on %d\n",pid);
+
+ io_flush();
+ _exit(0);
+ }
- waitpid(pid, &status, 0);
+ close(recv_pipe[1]);
+ io_close_input(f_in);
+ if (f_in != f_out) close(f_in);
+ generate_files(f_out,flist,local_name,recv_pipe[0]);
- return status;
+ io_flush();
+ waitpid(pid, &status, 0);
+ return status;
}
}
@@
-283,7
+301,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
- rprintf(FERROR,"nothing to do\n");
+ rprintf(FERROR,"
server_recv:
nothing to do\n");
exit_cleanup(1);
}
exit_cleanup(1);
}
@@
-340,7
+358,8
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
send_files(flist,f_out,f_in);
if (pid != -1) {
if (verbose > 3)
send_files(flist,f_out,f_in);
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"waiting on %d\n",pid);
+ rprintf(FINFO,"client_run waiting on %d\n",pid);
+ io_flush();
waitpid(pid, &status, 0);
}
report(-1);
waitpid(pid, &status, 0);
}
report(-1);
@@
-351,7
+370,7
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
- rprintf(FINFO,"nothing to do\n");
+ rprintf(FINFO,"
client:
nothing to do\n");
exit_cleanup(0);
}
exit_cleanup(0);
}
@@
-359,9
+378,10
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
status2 = do_recv(f_in,f_out,flist,local_name);
status2 = do_recv(f_in,f_out,flist,local_name);
- report(f_in);
-
if (pid != -1) {
if (pid != -1) {
+ if (verbose > 3)
+ rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ io_flush();
waitpid(pid, &status, 0);
}
waitpid(pid, &status, 0);
}
@@
-479,7
+499,7
@@
int main(int argc,char *argv[])
if (argc < 2) {
usage(FERROR);
if (argc < 2) {
usage(FERROR);
- exit(1);
+ exit
_cleanup
(1);
}
/* we set a 0 umask so that correct file permissions can be
}
/* we set a 0 umask so that correct file permissions can be
@@
-501,6
+521,11
@@
int main(int argc,char *argv[])
return daemon_main();
}
return daemon_main();
}
+ if (argc < 1) {
+ usage(FERROR);
+ exit_cleanup(1);
+ }
+
if (dry_run)
verbose = MAX(verbose,1);
if (dry_run)
verbose = MAX(verbose,1);