time_t t = time(NULL);
extern int am_server;
extern int am_sender;
+ extern int am_daemon;
if (!verbose) return;
+ if (am_daemon) {
+ rprintf(FINFO, "wrote %.0f bytes read %.0f bytes total size %.0f\n",
+ (double)write_total(),(double)read_total(),
+ (double)total_size);
+ }
+
if (am_server && am_sender) {
write_longint(f,read_total());
write_longint(f,write_total());
out = write_total();
tsize = total_size;
} else {
- in = read_longint(f);
out = read_longint(f);
+ in = read_longint(f);
tsize = read_longint(f);
}
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--;
argv[0] = ".";
}
- rprintf(FINFO,"sending file list\n");
-
flist = send_file_list(f_out,argc,argv);
send_files(flist,f_out,f_in);
report(f_out);
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--;
starttime = time(NULL);
am_root = (getuid() == 0);
+ if (argc < 2) {
+ usage(FERROR);
+ exit(1);
+ }
+
/* we set a 0 umask so that correct file permissions can be
carried across */
orig_umask = (int)umask(0);