time_t t = time(NULL);
extern int am_server;
extern int am_sender;
+ extern int am_daemon;
+
+ if (am_daemon) {
+ 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());
STRUCT_STAT st;
extern int orig_umask;
- if (do_stat(name,&st) == 0) {
- if (S_ISDIR(st.st_mode)) {
- if (chdir(name) != 0) {
- rprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno));
- exit_cleanup(1);
- }
- return NULL;
- }
- if (flist->count > 1) {
- rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
- exit_cleanup(1);
- }
- return name;
- }
-
- if (flist->count == 1)
- return name;
-
- if (!name)
- return NULL;
-
- if (do_mkdir(name,0777 & ~orig_umask) != 0) {
- rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
- exit_cleanup(1);
- } else {
- rprintf(FINFO,"created directory %s\n",name);
- }
-
- if (chdir(name) != 0) {
- rprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
- exit_cleanup(1);
- }
-
- return NULL;
+ if (do_stat(name,&st) == 0) {
+ if (S_ISDIR(st.st_mode)) {
+ if (chdir(name) != 0) {
+ rprintf(FERROR,"chdir %s : %s (1)\n",
+ name,strerror(errno));
+ exit_cleanup(1);
+ }
+ return NULL;
+ }
+ if (flist->count > 1) {
+ rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
+ exit_cleanup(1);
+ }
+ return name;
+ }
+
+ if (flist->count == 1)
+ return name;
+
+ if (!name)
+ return NULL;
+
+ if (do_mkdir(name,0777 & ~orig_umask) != 0) {
+ rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
+ exit_cleanup(1);
+ } else {
+ rprintf(FINFO,"created directory %s\n",name);
+ }
+
+ if (chdir(name) != 0) {
+ rprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
+ exit_cleanup(1);
+ }
+
+ return NULL;
}
struct file_list *flist;
char *dir = argv[0];
extern int relative_paths;
- extern int am_daemon;
extern int recurse;
if (verbose > 2)
argv[i] += l+1;
}
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc == 0 && recurse) {
argc=1;
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);
+ io_flush();
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;
-
- if (preserve_hard_links)
- init_hard_links(flist);
-
- if (pipe(recv_pipe) < 0) {
- rprintf(FERROR,"pipe failed in do_recv\n");
- exit(1);
- }
+ int pid;
+ int status=0;
+ int recv_pipe[2];
+ extern int preserve_hard_links;
+
+ if (preserve_hard_links)
+ init_hard_links(flist);
+
+ if (pipe(recv_pipe) < 0) {
+ rprintf(FERROR,"pipe failed in do_recv\n");
+ exit_cleanup(1);
+ }
+ io_flush();
+
+ if ((pid=do_fork()) == 0) {
+ close(recv_pipe[0]);
+ if (f_in != f_out) close(f_out);
- 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);
- }
+ recv_files(f_in,flist,local_name,recv_pipe[1]);
+ report(f_in);
- generate_files(f_out,flist,local_name,recv_pipe[0]);
+ if (verbose > 3)
+ rprintf(FINFO,"do_recv waiting on %d\n",pid);
- waitpid(pid, &status, 0);
+ io_flush();
+ _exit(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;
}
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int i, l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc > 0) {
dir = argv[0];
argc--;
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);
}
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);
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);
}
status2 = do_recv(f_in,f_out,flist,local_name);
- report(f_in);
-
if (pid != -1) {
+ if (verbose > 3)
+ rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ io_flush();
waitpid(pid, &status, 0);
}
starttime = time(NULL);
am_root = (getuid() == 0);
+ if (argc < 2) {
+ usage(FERROR);
+ exit_cleanup(1);
+ }
+
/* we set a 0 umask so that correct file permissions can be
carried across */
orig_umask = (int)umask(0);
return daemon_main();
}
+ if (argc < 1) {
+ usage(FERROR);
+ exit_cleanup(1);
+ }
+
if (dry_run)
verbose = MAX(verbose,1);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff