extern int do_stats;
if (am_daemon) {
- syslog(LOG_INFO,"wrote %.0f bytes read %.0f bytes total size %.0f\n",
- (double)stats.total_written,
- (double)stats.total_read,
- (double)stats.total_size);
+ log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender) return;
}
if (verbose > 2)
rprintf(FINFO,"get_local_name count=%d %s\n",
- flist->count, name);
+ flist->count, NS(name));
+
+ if (!name)
+ return NULL;
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name, 0)) {
rprintf(FERROR,"push_dir %s : %s (1)\n",
name,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
return NULL;
}
if (flist->count > 1) {
rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
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);
+ exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
rprintf(FINFO,"created directory %s\n",name);
if (!push_dir(name, 0)) {
rprintf(FERROR,"push_dir %s : %s (2)\n",
name,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
return NULL;
if (!relative_paths && !push_dir(dir, 0)) {
rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
argc--;
argv++;
if (pipe(recv_pipe) < 0) {
rprintf(FERROR,"pipe failed in do_recv\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_SOCKETIO);
}
io_flush();
if (!am_daemon && !push_dir(dir, 0)) {
rprintf(FERROR,"push_dir %s : %s (4)\n",
dir,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
}
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
rprintf(FERROR,"server_recv: nothing to do\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
if (argc > 0) {
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
+ extern int list_only;
setup_protocol(f_out,f_in);
report(-1);
exit_cleanup(status);
}
+
+ if (argc == 0) list_only = 1;
send_exclude_list(f_out);
extern int local_server;
extern int am_sender;
extern char *shell_cmd;
+ extern int rsync_port;
+
+ if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
+ char *host, *path;
+
+ host = argv[0] + strlen(URL_PREFIX);
+ p = strchr(host,'/');
+ if (p) {
+ *p = 0;
+ path = p+1;
+ } else {
+ path="";
+ }
+ p = strchr(host,':');
+ if (p) {
+ rsync_port = atoi(p+1);
+ *p = 0;
+ }
+ return start_socket_client(host, path, argc-1, argv+1);
+ }
p = find_colon(argv[0]);
return start_socket_client(argv[0], p+2, argc-1, argv+1);
}
- if (argc < 2) {
+ if (argc < 1) {
usage(FERROR);
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
am_sender = 0;
if (argc < 2) {
usage(FERROR);
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
if (local_server) {
shell_path?shell_path:"");
}
- if (!am_sender && argc != 1) {
+ if (!am_sender && argc > 1) {
usage(FERROR);
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
static RETSIGTYPE sigusr1_handler(int val) {
- exit_cleanup(1);
+ exit_cleanup(RERR_SIGNAL);
}
int main(int argc,char *argv[])
if (argc < 2) {
usage(FERROR);
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
/* we set a 0 umask so that correct file permissions can be
carried across */
orig_umask = (int)umask(0);
- if (!parse_arguments(argc, argv)) {
- exit_cleanup(1);
+ if (!parse_arguments(argc, argv, 1)) {
+ exit_cleanup(RERR_SYNTAX);
}
argc -= optind;
signal(SIGHUP,SIGNAL_CAST sig_int);
signal(SIGTERM,SIGNAL_CAST sig_int);
+ /* Initialize push_dir here because on some old systems getcwd
+ (implemented by forking "pwd" and reading its output) doesn't
+ work when there are other child processes. Also, on all systems
+ that implement getcwd that way "pwd" can't be found after chroot. */
+ push_dir(NULL,0);
+
if (am_daemon) {
return daemon_main();
}
if (argc < 1) {
usage(FERROR);
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
if (dry_run)
#ifndef SUPPORT_LINKS
if (!am_server && preserve_links) {
rprintf(FERROR,"ERROR: symbolic links not supported\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_UNSUPPORTED);
}
#endif