This should fix the bug where file transfer with compression failed with

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 038a2d2..930f823 100644 (file)
--- a/main.c
+++ b/main.c
@@ -93,7 +93,6 @@ static void server_options(char **args,int *argc)
   int ac = *argc;
   static char argstr[50];
   static char bsize[30];
-  static char slength[30];
   int i, x;
 
   args[ac++] = "--server";
@@ -137,6 +136,8 @@ static void server_options(char **args,int *argc)
     argstr[x++] = 'x';
   if (sparse_files)
     argstr[x++] = 'S';
+  if (do_compression)
+    argstr[x++] = 'z';
   argstr[x] = 0;
 
   if (x != 1) args[ac++] = argstr;
@@ -146,11 +147,6 @@ static void server_options(char **args,int *argc)
     args[ac++] = bsize;
   }    
 
-  if (csum_length != SUM_LENGTH) {
-    sprintf(slength,"--csum-length=%d",csum_length);
-    args[ac++] = slength;
-  }    
-  
   if (delete_mode)
     args[ac++] = "--delete";
 
@@ -295,7 +291,7 @@ void do_server_sender(int argc,char *argv[])
   }
     
 
-  flist = send_file_list(STDOUT_FILENO,recurse,argc,argv);
+  flist = send_file_list(STDOUT_FILENO,argc,argv);
   send_files(flist,STDOUT_FILENO,STDIN_FILENO);
   report(STDOUT_FILENO);
   exit_cleanup(0);
@@ -405,10 +401,10 @@ static void usage(FILE *f)
   fprintf(f,"-C, --cvs-exclude        auto ignore files in the same way CVS does\n");
   fprintf(f,"    --delete             delete files that don't exist on the sending side\n");
   fprintf(f,"-I, --ignore-times       don't exclude files that match length and time\n");
+  fprintf(f,"-z, --compress           compress file data\n");
   fprintf(f,"    --exclude FILE       exclude file FILE\n");
   fprintf(f,"    --exclude-from FILE  exclude files listed in FILE\n");
   fprintf(f,"    --suffix SUFFIX      override backup suffix\n");  
-  fprintf(f,"    --csum-length LENGTH set the checksum length\n");  
   fprintf(f,"    --version            print version number\n");  
 
   fprintf(f,"\n");
@@ -417,9 +413,9 @@ static void usage(FILE *f)
 }
 
 enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
-      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH,OPT_CSUM_LENGTH};
+      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH};
 
-static char *short_options = "oblHpguDCtcahvrIxnSe:B:";
+static char *short_options = "oblHpguDCtcahvrIxnSe:B:z";
 
 static struct option long_options[] = {
   {"version",     0,     0,    OPT_VERSION},
@@ -429,7 +425,6 @@ static struct option long_options[] = {
   {"exclude",     1,     0,    OPT_EXCLUDE},
   {"exclude-from",1,     0,    OPT_EXCLUDE_FROM},
   {"rsync-path",  1,     0,    OPT_RSYNC_PATH},
-  {"csum-length", 1,     0,    OPT_CSUM_LENGTH},
   {"one-file-system",0,  0,    'x'},
   {"ignore-times",0,     0,    'I'},
   {"help",        0,     0,    'h'},
@@ -452,6 +447,7 @@ static struct option long_options[] = {
   {"rsh",         1,     0,    'e'},
   {"suffix",      1,     0,    OPT_SUFFIX},
   {"block-size",  1,     0,    'B'},
+  {"compress",   0,     0,    'z'},
   {0,0,0,0}};
 
 int main(int argc,char *argv[])
@@ -470,8 +466,6 @@ int main(int argc,char *argv[])
 
     starttime = time(NULL);
 
-    checksum_init();
-
     while ((opt = getopt_long(argc, argv, 
                              short_options, long_options, &option_index)) 
           != -1) {
@@ -490,11 +484,6 @@ int main(int argc,char *argv[])
          rsync_path = optarg;
          break;
 
-       case OPT_CSUM_LENGTH:
-         csum_length = atoi(optarg);
-         csum_length = MIN(csum_length,SUM_LENGTH);
-         break;
-
        case 'I':
          ignore_times = 1;
          break;
@@ -627,8 +616,12 @@ int main(int argc,char *argv[])
          block_size = atoi(optarg);
          break;
 
+        case 'z':
+         do_compression = 1;
+         break;
+
        default:
-         fprintf(FERROR,"bad option -%c\n",opt);
+         /* fprintf(FERROR,"bad option -%c\n",opt); */
          exit_cleanup(1);
        }
     }
@@ -728,7 +721,7 @@ int main(int argc,char *argv[])
        add_cvs_excludes();
       if (delete_mode) 
        send_exclude_list(f_out);
-      flist = send_file_list(f_out,recurse,argc,argv);
+      flist = send_file_list(f_out,argc,argv);
       if (verbose > 3) 
        fprintf(FERROR,"file list sent\n");
       send_files(flist,f_out,f_in);