Tweaked the --delete-* option summaries.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index b891d79..09fd315 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2008 Wayne Davison
+ * Copyright (C) 2002-2009 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
@@ -603,7 +603,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                                        status = -1;
                                if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0)
                                        putenv(p);
-                               system(lp_postxfer_exec(i));
+                               if (system(lp_postxfer_exec(i)) < 0)
+                                       status = -1;
                                _exit(status);
                        }
                }
@@ -974,20 +975,23 @@ static void create_pid_file(void)
        char *pid_file = lp_pid_file();
        char pidbuf[16];
        pid_t pid = getpid();
-       int fd;
+       int fd, len;
 
        if (!pid_file || !*pid_file)
                return;
 
        cleanup_set_pid(pid);
        if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666 & ~orig_umask)) == -1) {
+         failure:
                cleanup_set_pid(0);
                fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));
                rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
                exit_cleanup(RERR_FILEIO);
        }
        snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
-       write(fd, pidbuf, strlen(pidbuf));
+       len = strlen(pidbuf);
+       if (write(fd, pidbuf, len) != len)
+               goto failure;
        close(fd);
 }