We no longer refer to a batch "prefix".

diff --git a/batch.c b/batch.c
index 42a249c..5373a48 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -8,7 +8,7 @@
 #include "rsync.h"
 #include <time.h>
 
 #include "rsync.h"
 #include <time.h>
 

-extern char *batch_prefix;
+extern char *batch_name;

 
 void write_batch_argvs_file(int argc, char *argv[])
 {
 
 void write_batch_argvs_file(int argc, char *argv[])
 {


@@ -16,7 +16,7 @@ void write_batch_argvs_file(int argc, char *argv[])
        char filename[MAXPATHLEN];
 
        stringjoin(filename, sizeof filename,
        char filename[MAXPATHLEN];
 
        stringjoin(filename, sizeof filename,

-                  batch_prefix, ".rsync_argvs", NULL);
+                  batch_name, ".rsync_argvs", NULL);

        fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
                     S_IRUSR | S_IWUSR | S_IEXEC);
        if (fd < 0) {
        fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
                     S_IRUSR | S_IWUSR | S_IEXEC);
        if (fd < 0) {


@@ -34,7 +34,7 @@ void write_batch_argvs_file(int argc, char *argv[])
                        write(fd, " ", 1);
                if (strncmp(argv[i], "--write-batch=", 14) == 0) {
                        write(fd, "--read-batch=", 13);
                        write(fd, " ", 1);
                if (strncmp(argv[i], "--write-batch=", 14) == 0) {
                        write(fd, "--read-batch=", 13);

-                       write(fd, batch_prefix, strlen(batch_prefix));
+                       write(fd, batch_name, strlen(batch_name));

                } else if (i == argc - 1) {
                        char *p = find_colon(argv[i]);
                        if (p) {
                } else if (i == argc - 1) {
                        char *p = find_colon(argv[i]);
                        if (p) {

diff --git a/main.c b/main.c
index b34127c..e0a9045 100644 (file)
--- a/main.c
+++ b/main.c
@@ -59,7 +59,7 @@ extern char *files_from;
 extern char *remote_filesfrom_file;
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *remote_filesfrom_file;
 extern char *rsync_path;
 extern char *shell_cmd;

-extern char *batch_prefix;
+extern char *batch_name;

 
 
 /* there's probably never more than at most 2 outstanding child processes,
 
 
 /* there's probably never more than at most 2 outstanding child processes,


@@ -598,7 +598,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
 
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */

-               
+

                recv_exclude_list(f_in);
                if (cvs_exclude)
                        add_cvs_excludes();
                recv_exclude_list(f_in);
                if (cvs_exclude)
                        add_cvs_excludes();


@@ -1074,12 +1074,12 @@ int main(int argc,char *argv[])
                if (write_batch)
                        write_batch_argvs_file(orig_argc, orig_argv);
 
                if (write_batch)
                        write_batch_argvs_file(orig_argc, orig_argv);
 

-               batch_fd = do_open(batch_prefix,
+               batch_fd = do_open(batch_name,

                                   write_batch ? O_WRONLY | O_CREAT | O_TRUNC
                                   : O_RDONLY, S_IRUSR | S_IWUSR);
                if (batch_fd < 0) {
                        rsyserr(FERROR, errno, "Batch file %s open error",
                                   write_batch ? O_WRONLY | O_CREAT | O_TRUNC
                                   : O_RDONLY, S_IRUSR | S_IWUSR);
                if (batch_fd < 0) {
                        rsyserr(FERROR, errno, "Batch file %s open error",

-                               batch_prefix);
+                               batch_name);

                        exit_cleanup(RERR_FILEIO);
                }
        }
                        exit_cleanup(RERR_FILEIO);
                }
        }

diff --git a/options.c b/options.c
index d11e641..3485a42 100644 (file)
--- a/options.c
+++ b/options.c
@@ -133,8 +133,8 @@ int quiet = 0;
 int always_checksum = 0;
 int list_only = 0;
 
 int always_checksum = 0;
 int list_only = 0;
 

-#define MAX_BATCH_PREFIX_LEN 256       /* Must be less than MAXPATHLEN-13 */
-char *batch_prefix = NULL;
+#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
+char *batch_name = NULL;

 
 static int daemon_opt;   /* sets am_daemon after option error-reporting */
 static int modify_window_set;
 
 static int daemon_opt;   /* sets am_daemon after option error-reporting */
 static int modify_window_set;


@@ -291,8 +291,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,"     --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,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
-  rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
+  rprintf(F,"     --write-batch=FILE      write a batch to FILE\n");
+  rprintf(F,"     --read-batch=FILE       read a batch from FILE\n");

   rprintf(F,"     --checksum-seed=NUM     set block/file checksum seed\n");
 #ifdef INET6
   rprintf(F," -4  --ipv4                  prefer IPv4\n");
   rprintf(F,"     --checksum-seed=NUM     set block/file checksum seed\n");
 #ifdef INET6
   rprintf(F," -4  --ipv4                  prefer IPv4\n");


@@ -385,8 +385,8 @@ static struct poptOption long_options[] = {
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
   {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
   {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
   {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
   {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },

-  {"read-batch",       0,  POPT_ARG_STRING, &batch_prefix,  OPT_READ_BATCH, 0, 0 },
-  {"write-batch",      0,  POPT_ARG_STRING, &batch_prefix,  OPT_WRITE_BATCH, 0, 0 },
+  {"read-batch",       0,  POPT_ARG_STRING, &batch_name,  OPT_READ_BATCH, 0, 0 },
+  {"write-batch",      0,  POPT_ARG_STRING, &batch_name,  OPT_WRITE_BATCH, 0, 0 },

   {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
   {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
   {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
   {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },


@@ -568,12 +568,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        break;
 
                case OPT_WRITE_BATCH:
                        break;
 
                case OPT_WRITE_BATCH:

-                       /* popt stores the filename in batch_prefix for us */
+                       /* batch_name is already set */

                        write_batch = 1;
                        break;
 
                case OPT_READ_BATCH:
                        write_batch = 1;
                        break;
 
                case OPT_READ_BATCH:

-                       /* popt stores the filename in batch_prefix for us */
+                       /* batch_name is already set */

                        read_batch = 1;
                        break;
 
                        read_batch = 1;
                        break;
 


@@ -646,12 +646,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                /* We don't actually exit_cleanup(), so that we can still service
                 * older version clients that still send batch args to server. */
                read_batch = write_batch = 0;
                /* We don't actually exit_cleanup(), so that we can still service
                 * older version clients that still send batch args to server. */
                read_batch = write_batch = 0;

-               batch_prefix = NULL;
+               batch_name = NULL;

        }
        }

-       if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) {
+       if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {

                rprintf(FERROR,
                rprintf(FERROR,

-                       "the batch-file prefix must be %d characters or less.\n",
-                       MAX_BATCH_PREFIX_LEN);
+                       "the batch-file name must be %d characters or less.\n",
+                       MAX_BATCH_NAME_LEN);

                exit_cleanup(RERR_SYNTAX);
        }
 
                exit_cleanup(RERR_SYNTAX);
        }