Fix for batch mode (was Re: batch mode maintainability)

Jos Backus josb at cncdsl.com
Thu Jan 31 09:12:35 EST 2002


On Wed, Jan 30, 2002 at 02:56:25PM -0600, Dave Dykstra wrote:
> It should do more, it should block -z from being used with --write-batch.

Or read-batch, for that matter. The second if () handles this situation:

Index: options.c
===================================================================
RCS file: /cvsroot/rsync/options.c,v
retrieving revision 1.77
diff -u -r1.77 options.c
--- options.c	25 Jan 2002 10:42:23 -0000	1.77
+++ options.c	30 Jan 2002 22:14:11 -0000
@@ -531,6 +536,22 @@
 		}
 	}
 
+	if (write_batch && read_batch) {
+	    snprintf(err_buf,sizeof(err_buf),
+		"write-batch and read-batch can not be used together\n");
+	    rprintf(FERROR,"ERROR: write-batch and read-batch"
+		" can not be used together\n");
+	    return 0;
+	}
+
+	if (do_compression && (write_batch || read_batch)) {
+	    snprintf(err_buf,sizeof(err_buf),
+		"compress can not be used with write-batch or read-batch\n");
+	    rprintf(FERROR,"ERROR: compress can not be used with"
+		"  write-batch or read-batch\n");
+	    return 0;
+	}
+

-- 
Jos Backus                 _/  _/_/_/        Santa Clara, CA
                          _/  _/   _/
                         _/  _/_/_/             
                    _/  _/  _/    _/
josb at cncdsl.com     _/_/   _/_/_/            use Std::Disclaimer;




More information about the rsync mailing list