Make idev, hlink and file_struct + strings use allocation

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 23452f5..e26c7b1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -27,6 +27,7 @@ extern struct stats stats;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
+extern int am_generator;
 extern int am_daemon;
 extern int verbose;
 extern int blocking_io;
@@ -57,6 +58,7 @@ extern char *rsync_path;
 extern char *shell_cmd;
 extern struct file_list *batch_flist;
 
+
 /* there's probably never more than at most 2 outstanding child processes,
  * but set it higher just in case.
  */
@@ -114,6 +116,9 @@ static void report(int f)
                show_flist_stats();
        }
 
+       if (am_generator)
+               return;
+
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
                if (f == -1 || !am_sender) return;
@@ -198,12 +203,14 @@ static void show_malloc_stats(void)
                getpid(),
                am_server ? "server " : "",
                am_daemon ? "daemon " : "",
-               am_sender ? "sender" : "receiver");
+               who_am_i());
        rprintf(FINFO, "  arena:     %10d   (bytes from sbrk)\n", mi.arena);
        rprintf(FINFO, "  ordblks:   %10d   (chunks not in use)\n", mi.ordblks);
        rprintf(FINFO, "  smblks:    %10d\n", mi.smblks);
        rprintf(FINFO, "  hblks:     %10d   (chunks from mmap)\n", mi.hblks);
        rprintf(FINFO, "  hblkhd:    %10d   (bytes from mmap)\n", mi.hblkhd);
+       rprintf(FINFO, "  allmem:    %10d   (bytes from sbrk + mmap)\n",
+           mi.arena + mi.hblkhd);
        rprintf(FINFO, "  usmblks:   %10d\n", mi.usmblks);
        rprintf(FINFO, "  fsmblks:   %10d\n", mi.fsmblks);
        rprintf(FINFO, "  uordblks:  %10d   (bytes used)\n", mi.uordblks);
@@ -214,12 +221,13 @@ static void show_malloc_stats(void)
 
 
 /* Start the remote shell.   cmd may be NULL to use the default. */
-static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
+                   int *f_in, int *f_out)
 {
+       int i, argc = 0;
        char *args[100];
-       int i,argc=0;
        pid_t ret;
-       char *tok,*dir=NULL;
+       char *tok, *dir = NULL;
        int dash_l_set = 0;
 
        if (!read_batch && !local_server) {
@@ -232,9 +240,8 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
                if (!cmd)
                        goto oom;
 
-               for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
+               for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " "))
                        args[argc++] = tok;
-               }
 
                /* check to see if we've already been given '-l user' in
                 * the remote-shell command */
@@ -278,6 +285,11 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
        if (!daemon_over_rsh && path && *path)
                args[argc++] = path;
 
+       if (argc >= (int)(sizeof args / sizeof args[0])) {
+               rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+               exit_cleanup(RERR_MALLOC); /* XXX Need better RERR? */
+       }
+
        args[argc] = NULL;
 
        if (verbose > 3) {
@@ -305,8 +317,6 @@ oom:
 }
 
 
-
-
 static char *get_local_name(struct file_list *flist,char *name)
 {
        STRUCT_STAT st;
@@ -363,8 +373,10 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        struct file_list *flist;
        char *dir = argv[0];
 
-       if (verbose > 2)
-               rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
+       if (verbose > 2) {
+               rprintf(FINFO, "server_sender starting pid=%ld\n",
+                       (long)getpid());
+       }
 
        if (!relative_paths && !push_dir(dir)) {
                rprintf(FERROR, "push_dir %s failed: %s (3)\n",
@@ -453,6 +465,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
                        msleep(20);
        }
 
+       am_generator = 1;
+
        close(error_pipe[1]);
        if (f_in != f_out) close(f_in);
 
@@ -462,7 +476,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out, flist, local_name);
 
-       get_redo_num(); /* Read final -1, and any prior messages. */
+       get_redo_num(); /* Read final MSG_DONE and any prior messages. */
+       report(-1);
        io_flush(FULL_FLUSH);
        if (protocol_version >= 24) {
                /* send a final goodbye message */
@@ -481,11 +496,13 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 {
        int status;
        struct file_list *flist;
-       char *local_name=NULL;
+       char *local_name = NULL;
        char *dir = NULL;
 
-       if (verbose > 2)
-               rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+       if (verbose > 2) {
+               rprintf(FINFO, "server_recv(%d) starting pid=%ld\n",
+                       argc, (long)getpid());
+       }
 
        if (am_daemon && lp_read_only(module_id) && !am_sender) {
                rprintf(FERROR,"ERROR: module is read only\n");
@@ -973,7 +990,7 @@ int main(int argc,char *argv[])
 #endif /* def MAINTAINER_MODE */
 
        starttime = time(NULL);
-       am_root = (getuid() == 0);
+       am_root = (MY_UID() == 0);
 
        memset(&stats, 0, sizeof(stats));
 
@@ -1007,6 +1024,8 @@ int main(int argc,char *argv[])
         * that implement getcwd that way "pwd" can't be found after chroot. */
        push_dir(NULL);
 
+       init_flist();
+
        if (write_batch && !am_server) {
                write_batch_argvs_file(orig_argc, orig_argv);
        }
@@ -1022,13 +1041,6 @@ int main(int argc,char *argv[])
        if (dry_run)
                verbose = MAX(verbose,1);
 
-#ifndef SUPPORT_LINKS
-       if (!am_server && preserve_links) {
-               rprintf(FERROR,"ERROR: symbolic links not supported\n");
-               exit_cleanup(RERR_UNSUPPORTED);
-       }
-#endif
-
        if (am_server) {
                set_nonblocking(STDIN_FILENO);
                set_nonblocking(STDOUT_FILENO);