added globbing support in the rsync daemon. This will allow you to

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index e9a0039..401955e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -48,8 +48,8 @@ static void report(int f)
                out = write_total();
                tsize = total_size;
        } else {
-               in = read_longint(f);
                out = read_longint(f);
+               in = read_longint(f);
                tsize = read_longint(f);
        }
        
@@ -204,26 +204,12 @@ 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--;
                argv[0] = ".";
        }
        
-       rprintf(FINFO,"sending file list\n");
-       
        flist = send_file_list(f_out,argc,argv);
        send_files(flist,f_out,f_in);
        report(f_out);
@@ -274,18 +260,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--;
@@ -496,6 +470,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);