use strlcat() strlcpy() and slprintf() whenever possible to avoid any

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index ea7622a..6dfaf39 100644 (file)
--- a/main.c
+++ b/main.c
@@ -32,9 +32,16 @@ static void report(int f)
        time_t t = time(NULL);
        extern int am_server;
        extern int am_sender;
+       extern int am_daemon;
 
        if (!verbose) return;
 
+       if (am_daemon) {
+               rprintf(FINFO, "wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+                       (double)write_total(),(double)read_total(),
+                       (double)total_size);
+       }
+
        if (am_server && am_sender) {
                write_longint(f,read_total());
                write_longint(f,write_total());
@@ -183,7 +190,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        struct file_list *flist;
        char *dir = argv[0];
        extern int relative_paths;
-       extern int am_daemon;
        extern int recurse;
 
        if (verbose > 2)
@@ -204,18 +210,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
                        argv[i] += l+1;
        }
 
-       if (am_daemon) {
-               extern int module_id;
-               char *name = lp_name(module_id);
-               int l = strlen(name);
-               for (i=0;i<argc;i++) {
-                       if (strncmp(argv[i], name, l) == 0) {
-                               argv[i] += l;
-                               if (!*argv[i]) argv[i] = ".";
-                       }
-               }
-       }
-       
        if (argc == 0 && recurse) {
                argc=1;
                argv--;
@@ -272,18 +266,6 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
        if (verbose > 2)
                rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
        
-       if (am_daemon) {
-               extern int module_id;
-               char *name = lp_name(module_id);
-               int i, l = strlen(name);
-               for (i=0;i<argc;i++) {
-                       if (strncmp(argv[i], name, l) == 0) {
-                               argv[i] += l;
-                               if (!*argv[i]) argv[i] = ".";
-                       }
-               }
-       }
-
        if (argc > 0) {
                dir = argv[0];
                argc--;
@@ -494,6 +476,11 @@ int main(int argc,char *argv[])
        starttime = time(NULL);
        am_root = (getuid() == 0);
 
+       if (argc < 2) {
+               usage(FERROR);
+               exit(1);
+       }
+
        /* we set a 0 umask so that correct file permissions can be
           carried across */
        orig_umask = (int)umask(0);