X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4db414928370edd557a1ff09cacc3aee2b39656c..6902ed178ba54c8e1c410519f7ee576ddb42554c:/options.c

diff --git a/options.c b/options.c
index 4c34e4ca..bfce8f68 100644
--- a/options.c
+++ b/options.c
@@ -74,6 +74,9 @@ int modify_window=0;
 #endif
 int blocking_io=0;
 
+int read_batch=0;  /* dw */
+int write_batch=0; /* dw */
+
 char *backup_suffix = BACKUP_SUFFIX;
 char *tmpdir = NULL;
 char *compare_dest = NULL;
@@ -81,7 +84,7 @@ char *config_file = RSYNCD_CONF;
 char *shell_cmd = NULL;
 char *log_format = NULL;
 char *password_file = NULL;
-char *rsync_path = RSYNC_NAME;
+char *rsync_path = RSYNC_PATH;
 char *backup_dir = NULL;
 int rsync_port = RSYNC_PORT;
 
@@ -90,6 +93,8 @@ int quiet = 0;
 int always_checksum = 0;
 int list_only = 0;
 
+char *batch_ext = NULL;
+
 static int modify_window_set;
 
 
@@ -206,6 +211,8 @@ void usage(enum logcode F)
   rprintf(F,"     --log-format=FORMAT     log file transfers using specified format\n");  
   rprintf(F,"     --password-file=FILE    get password from FILE\n");
   rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
+  rprintf(F," -f  --read-batch=FILE       read batch file\n");
+  rprintf(F," -F  --write-batch           write batch file\n");
   rprintf(F," -h, --help                  show this help screen\n");
 
   rprintf(F,"\n");
@@ -290,10 +297,11 @@ static struct poptOption long_options[] = {
   {"address",          0,  POPT_ARG_STRING, 0,               OPT_ADDRESS},
   {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir},
   {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links},
+  {"read-batch",      'f', POPT_ARG_STRING, &batch_ext, 'f'},
+  {"write-batch",     'F', POPT_ARG_NONE,   &write_batch, 0},
   {0,0,0,0}
 };
 
-
 static char err_buf[100];
 
 
@@ -327,7 +335,7 @@ static int check_refuse_options(char *ref, int opt)
 	while ((p = strstr(ref,name))) {
 		if ((p==ref || p[-1]==' ') &&
 		    (p[len] == ' ' || p[len] == 0)) {
-			slprintf(err_buf,sizeof(err_buf),
+			snprintf(err_buf,sizeof(err_buf),
 				 "The '%s' option is not supported by this server\n", name);
 			return 1;
 		}
@@ -418,7 +426,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                          * rprintf?  Everybody who gets this message
                          * ought to send it to the client and also to
                          * the logs. */
-			slprintf(err_buf,sizeof(err_buf),
+			snprintf(err_buf,sizeof(err_buf),
                                  "hard links are not supported on this %s\n",
 				 am_server ? "server" : "client");
 			rprintf(FERROR,"ERROR: hard links not supported on this platform\n");
@@ -468,10 +476,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			}
 			break;
 
+		case 'f':
+			/* The filename is stored for us by popt */
+			read_batch = 1;
+			break;
+
 		default:
                         /* FIXME: If --daemon is specified, then errors for later
                          * parameters seem to disappear. */
-                        slprintf(err_buf, sizeof(err_buf),
+                        snprintf(err_buf, sizeof(err_buf),
                                  "%s%s: %s\n",
                                  am_server ? "on remote machine: " : "",
                                  poptBadOption(pc, POPT_BADOPTION_NOALIAS),
@@ -501,6 +514,7 @@ void server_options(char **args,int *argc)
 	static char mdelete[30];
 	static char mwindow[30];
 	static char bw[50];
+	static char fext[20]; /* dw */
 
 	int i, x;
 
@@ -555,6 +569,8 @@ void server_options(char **args,int *argc)
 		argstr[x++] = 'S';
 	if (do_compression)
 		argstr[x++] = 'z';
+	if (write_batch)
+	    argstr[x++] = 'F'; /* dw */
 
 	/* this is a complete hack - blame Rusty 
 
@@ -568,22 +584,27 @@ void server_options(char **args,int *argc)
 	if (x != 1) args[ac++] = argstr;
 
 	if (block_size != BLOCK_SIZE) {
-		slprintf(bsize,sizeof(bsize),"-B%d",block_size);
+		snprintf(bsize,sizeof(bsize),"-B%d",block_size);
 		args[ac++] = bsize;
 	}    
 
 	if (max_delete && am_sender) {
-		slprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete);
+		snprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete);
 		args[ac++] = mdelete;
 	}    
+	
+	if (batch_ext != NULL) {
+		sprintf(fext,"-f%s",batch_ext);
+		args[ac++] = fext;
+	}
 
 	if (io_timeout) {
-		slprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout);
+		snprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout);
 		args[ac++] = iotime;
 	}    
 
 	if (bwlimit) {
-		slprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit);
+		snprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit);
 		args[ac++] = bw;
 	}
 
@@ -602,7 +623,7 @@ void server_options(char **args,int *argc)
 		args[ac++] = "--size-only";
 
 	if (modify_window_set) {
-	        slprintf(mwindow,sizeof(mwindow),"--modify-window=%d",
+	        snprintf(mwindow,sizeof(mwindow),"--modify-window=%d",
 			 modify_window);
 		args[ac++] = mwindow;
 	}