Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
+ Copyright (C) 2001 by Martin Pool <mbp@samba.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
}
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run waiting on %d\n",pid);
+ rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
io_flush();
wait_process(pid, &status);
}
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid);
io_flush();
wait_process(pid, &status);
}
}
+static int copy_argv (char *argv[])
+{
+ int i;
+
+ for (i = 0; argv[i]; i++) {
+ if (!(argv[i] = strdup(argv[i]))) {
+ rprintf (FERROR, "out of memory at %s(%d)\n",
+ __FILE__, __LINE__);
+ return RERR_MALLOC;
+ }
+ }
+
+ return 0;
+}
+
+
/*
* Start a client for either type of remote connection. Work out
* whether the arguments request a remote shell or rsyncd connection,
extern char *shell_cmd;
extern int rsync_port;
extern int whole_file;
- char *argv0 = strdup(argv[0]);
extern int read_batch;
+ int rc;
+
+ /* Don't clobber argv[] so that ps(1) can still show the right
+ command line. */
+ if ((rc = copy_argv (argv)))
+ return rc;
- if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
+ if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
char *host, *path;
- host = argv0 + strlen(URL_PREFIX);
+ host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
*p = 0;
if (p) {
if (p[1] == ':') {
*p = 0;
- return start_socket_client(argv0, p+2, argc-1, argv+1);
+ return start_socket_client(argv[0], p+2, argc-1, argv+1);
}
if (argc < 1) {
am_sender = 0;
*p = 0;
- shell_machine = argv0;
+ shell_machine = argv[0];
shell_path = p+1;
argc--;
argv++;