Handle the --remove-sender-files option by sending MSG_SUCCESS for

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index e94dd3f..676dc5e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -176,7 +176,6 @@ static void handle_stats(int f)
                return;
 
        if (am_daemon) {
-               log_exit(0, __FILE__, __LINE__);
                if (f == -1 || !am_sender)
                        return;
        }
@@ -224,7 +223,8 @@ static void handle_stats(int f)
 static void output_summary(void)
 {
        if (do_stats) {
-               rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
+               rprintf(FCLIENT, "\n");
+               rprintf(FINFO,"Number of files: %d\n", stats.num_files);
                rprintf(FINFO,"Number of files transferred: %d\n",
                        stats.num_transferred_files);
                rprintf(FINFO,"Total file size: %s bytes\n",
@@ -251,8 +251,9 @@ static void output_summary(void)
        }
 
        if (verbose || do_stats) {
+               rprintf(FCLIENT, "\n");
                rprintf(FINFO,
-                       "\nsent %s bytes  received %s bytes  %s bytes/sec\n",
+                       "sent %s bytes  received %s bytes  %s bytes/sec\n",
                        human_num(total_written), human_num(total_read),
                        human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2));
                rprintf(FINFO, "total size is %s  speedup is %.2f\n",
@@ -275,7 +276,8 @@ static void show_malloc_stats(void)
 
        mi = mallinfo();
 
-       rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
+       rprintf(FCLIENT, "\n");
+       rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
                getpid(), am_server ? "server " : "",
                am_daemon ? "daemon " : "", who_am_i());
        rprintf(FINFO, "  arena:     %10ld   (bytes from sbrk)\n",
@@ -411,8 +413,8 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
 
        if (verbose > 3) {
                for (i = 0; i < argc; i++)
-                       rprintf(FINFO, "cmd[%d]=%s ", i, args[i]);
-               rprintf(FINFO, "\n");
+                       rprintf(FCLIENT, "cmd[%d]=%s ", i, args[i]);
+               rprintf(FCLIENT, "\n");
        }
 
        if (read_batch) {
@@ -453,12 +455,14 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
  * destination path instead of its file-list name.  This requires a
  * "local name" for writing out the destination file.
  *
- * So, our task is to figure out what mode/local-name we need and return
- * either a NULL for mode 1, or the local-name for mode 2.  We also
- * change directory if there are any path components in dest_path. */
+ * So, our task is to figure out what mode/local-name we need.
+ * For mode 1, we change into the destination directory and return NULL.
+ * For mode 2, we change into the directory containing the destination
+ * file (if we aren't already there) and return the local-name. */
 static char *get_local_name(struct file_list *flist, char *dest_path)
 {
        STRUCT_STAT st;
+       int statret;
        char *cp;
 
        if (verbose > 2) {
@@ -469,11 +473,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
        if (!dest_path || list_only)
                return NULL;
 
-       /* If the destination path refers to an existing directory, enter
-        * it and use mode 1.  If there is something other than a directory
-        * at the destination path, we must be transferring one file
-        * (anything at the destination will be overwritten). */
-       if (safe_stat(dest_path, &st) == 0) {
+       /* See what currently exists at the destination. */
+       if ((statret = safe_stat(dest_path, &st)) == 0) {
+               /* If the destination is a dir, enter it and use mode 1. */
                if (S_ISDIR(st.st_mode)) {
                        if (sanitize_paths)
                                die_on_unsafe_path(dest_path, 0);
@@ -500,21 +502,28 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                        exit_cleanup(RERR_FILESELECT);
                }
        } else if (errno != ENOENT) {
-               rsyserr(FERROR, errno, "cannot stat destination %s",
+               /* If we don't know what's at the destination, fail. */
+               rsyserr(FERROR, errno, "ERROR: cannot stat destination %s",
                        full_fname(dest_path));
                exit_cleanup(RERR_FILESELECT);
        }
 
        cp = strrchr(dest_path, '/');
 
-       /* If the destination path ends in a slash or we are transferring
-        * multiple files, create a directory at the destination path,
-        * enter the new directory, and use mode 1. */
+       /* If we need a destination directory because the transfer is not
+        * of a single non-directory or the user has requested one via a
+        * destination path ending in a slash, create one and use mode 1. */
        if (flist->count > 1 || (cp && !cp[1])) {
                /* Lop off the final slash (if any). */
                if (cp && !cp[1])
                        *cp = '\0';
 
+               if (statret == 0) {
+                       rprintf(FERROR,
+                           "ERROR: destination path is not a directory\n");
+                       exit_cleanup(RERR_SYNTAX);
+               }
+
                if (mkdir_defmode(dest_path) != 0) {
                        rsyserr(FERROR, errno, "mkdir %s failed",
                                full_fname(dest_path));