Further modifications to the copyright comment section.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 1cb6a09..786c4be 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2002-2007 Wayne Davison
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,6 +30,7 @@ extern int am_server;
 extern int am_daemon;
 extern int am_root;
 extern int rsync_port;
+extern int ignore_errors;
 extern int kluge_around_eof;
 extern int daemon_over_rsh;
 extern int sanitize_paths;
@@ -110,7 +110,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        return ret ? ret : client_run(fd, fd, -1, argc, argv);
 }
 
-int start_inband_exchange(char *user, char *path, int f_in, int f_out,
+int start_inband_exchange(const char *user, char *path, int f_in, int f_out,
                          int argc)
 {
        int i;
@@ -244,7 +244,9 @@ static char *finish_pre_exec(pid_t pid, int fd, char *request,
        if (wait_process(pid, &status, 0) < 0
         || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
                char *e;
-               if (asprintf(&e, "pre-xfer exec returned failure (%d)\n", status) < 0)
+               if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n",
+                            status, status < 0 ? ": " : "",
+                            status < 0 ? strerror(errno) : "") < 0)
                        out_of_memory("finish_pre_exec");
                return e;
        }
@@ -340,7 +342,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        if (am_root) {
                p = lp_uid(i);
                if (!name_to_uid(p, &uid)) {
-                       if (!isdigit(*(unsigned char *)p)) {
+                       if (!isDigit(p)) {
                                rprintf(FLOG, "Invalid uid %s\n", p);
                                io_printf(f_out, "@ERROR: invalid uid %s\n", p);
                                return -1;
@@ -350,7 +352,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 
                p = lp_gid(i);
                if (!name_to_gid(p, &gid)) {
-                       if (!isdigit(*(unsigned char *)p)) {
+                       if (!isDigit(p)) {
                                rprintf(FLOG, "Invalid gid %s\n", p);
                                io_printf(f_out, "@ERROR: invalid gid %s\n", p);
                                return -1;
@@ -624,6 +626,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        verbose = 0; /* future verbosity is controlled by client options */
        ret = parse_arguments(&argc, (const char ***) &argv, 0);
        quiet = 0; /* Don't let someone try to be tricky. */
+       if (lp_ignore_errors(module_id))
+               ignore_errors = 1;
 
        if (filesfrom_fd == 0)
                filesfrom_fd = f_in;
@@ -678,7 +682,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 
        if (!ret || err_msg) {
                if (err_msg)
-                       rprintf(FERROR, err_msg);
+                       rwrite(FERROR, err_msg, strlen(err_msg));
                else
                        option_error();
                msleep(400);