-/*
- Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+
+ Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
msleep(20);
io_flush();
}
+
+ /* TODO: If the child exited on a signal, then log an
+ * appropriate error message. Perhaps we should also accept a
+ * message describing the purpose of the child. Also indicate
+ * this to the caller so that thhey know something went
+ * wrong. */
*status = WEXITSTATUS(*status);
}
}
+/* Start the remote shell. */
+/* TODO: When the shell exits, look at its return value, as this may
+ * well tell us if something went wrong in trying to connect to the
+ * remote machine. Although it doesn't seem to be specified anywhere,
+ * ssh and the shell seem to return these values:
+ *
+ * 124 if the command exited with status 255
+ * 125 if the command is killed by a signal
+ * 126 if the command cannot be run
+ * 127 if the command is not found
+ *
+ * and we could use this to give a better explanation if the remote
+ * command is not found.
+ */
static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
{
char *args[100];
close(recv_pipe[1]);
io_flush();
/* finally we go to sleep until our parent kills us
- with a USR2 signal. We sleepp for a short time as on
+ with a USR2 signal. We sleep for a short time as on
some OSes a signal won't interrupt a sleep! */
- while (1) sleep(1);
+ while (1) msleep(20);
}
close(recv_pipe[1]);
close(error_pipe[1]);
- io_close_input(f_in);
if (f_in != f_out) close(f_in);
io_start_buffering(f_out);
exit_cleanup(0);
}
+
+/*
+ * This is called once the connection has been negotiated. It is used
+ * for rsyncd, remote-shell, and local connections.
+ */
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
{
struct file_list *flist;
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
- extern int list_only;
extern int remote_version;
set_nonblocking(f_in);
exit_cleanup(status);
}
- if (argc == 0) list_only = 1;
+ if (argc == 0) {
+ extern int list_only;
+ list_only = 1;
+ }
send_exclude_list(f_out);
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
- rprintf(FINFO,"client: nothing to do\n");
+ rprintf(FINFO, "client: nothing to do: "
+ "perhaps you need to specify some filenames or "
+ "the --recursive option?\n");
exit_cleanup(0);
}
return p;
}
+
+/*
+ * Start a client for either type of remote connection. Work out
+ * whether the arguments request a remote shell or rsyncd connection,
+ * and call the appropriate connection function, then run_client.
+ */
static int start_client(int argc, char *argv[])
{
char *p;
extern int am_sender;
extern char *shell_cmd;
extern int rsync_port;
+ char *argv0 = strdup(argv[0]);
- if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
+ if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
char *host, *path;
- host = argv[0] + strlen(URL_PREFIX);
+ host = argv0 + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
*p = 0;
return start_socket_client(host, path, argc-1, argv+1);
}
- p = find_colon(argv[0]);
+ p = find_colon(argv0);
if (p) {
if (p[1] == ':') {
*p = 0;
- return start_socket_client(argv[0], p+2, argc-1, argv+1);
+ return start_socket_client(argv0, p+2, argc-1, argv+1);
}
if (argc < 1) {
am_sender = 0;
*p = 0;
- shell_machine = argv[0];
+ shell_machine = argv0;
shell_path = p+1;
argc--;
argv++;
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
+
+ if (argc == 0 && !am_sender) {
+ extern int list_only;
+ list_only = 1;
+ }
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
carried across */
orig_umask = (int)umask(0);
- if (!parse_arguments(argc, argv, 1)) {
+ if (!parse_arguments(&argc, (const char ***) &argv, 1)) {
+ /* FIXME: We ought to call the same error-handling
+ * code here, rather than relying on getopt. */
+ option_error();
exit_cleanup(RERR_SYNTAX);
}
- argc -= optind;
- argv += optind;
- optind = 0;
-
signal(SIGCHLD,SIG_IGN);
signal(SIGINT,SIGNAL_CAST sig_int);
signal(SIGPIPE,SIGNAL_CAST sig_int);