-/* -*- c-file-style: "linux" -*-
-
- Weiss 1/1999
- Batch utilities for rsync.
-
-*/
+/*
+ * Support for the batch-file options.
+ *
+ * Copyright (C) 1999 Weiss
+ * Copyright (C) 2004 Chris Shoemaker
+ * Copyright (C) 2004-2009 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
+ */
#include "rsync.h"
+#include "zlib/zlib.h"
#include <time.h>
-extern int am_sender;
extern int eol_nulls;
extern int recurse;
extern int xfer_dirs;
extern int preserve_devices;
extern int preserve_uid;
extern int preserve_gid;
+extern int preserve_acls;
+extern int preserve_xattrs;
extern int always_checksum;
extern int do_compression;
+extern int inplace;
+extern int append_mode;
extern int protocol_version;
extern char *batch_name;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
+#endif
+
+extern filter_rule_list filter_list;
+
+int batch_stream_flags;
-extern struct filter_list_struct filter_list;
+static int tweaked_append;
+static int tweaked_append_verify;
+static int tweaked_iconv;
static int *flag_ptr[] = {
&recurse, /* 0 */
&always_checksum, /* 6 */
&xfer_dirs, /* 7 (protocol 29) */
&do_compression, /* 8 (protocol 29) */
+ &tweaked_iconv, /* 9 (protocol 30) */
+ &preserve_acls, /* 10 (protocol 30) */
+ &preserve_xattrs, /* 11 (protocol 30) */
+ &inplace, /* 12 (protocol 30) */
+ &tweaked_append, /* 13 (protocol 30) */
+ &tweaked_append_verify, /* 14 (protocol 30) */
NULL
};
"--checksum (-c)",
"--dirs (-d)",
"--compress (-z)",
+ "--iconv",
+ "--acls (-A)",
+ "--xattrs (-X)",
+ "--inplace",
+ "--append",
+ "--append-verify",
NULL
};
{
int i, flags;
+ tweaked_append = append_mode == 1;
+ tweaked_append_verify = append_mode == 2;
+#ifdef ICONV_OPTION
+ tweaked_iconv = iconv_opt != NULL;
+#endif
+
/* Start the batch file with a bitmap of data-stream-affecting
* flags. */
- if (protocol_version < 29)
- flag_ptr[7] = NULL;
for (i = 0, flags = 0; flag_ptr[i]; i++) {
if (*flag_ptr[i])
flags |= 1 << i;
void read_stream_flags(int fd)
{
- int i, flags;
+ batch_stream_flags = read_int(fd);
+}
+
+void check_batch_flags(void)
+{
+ int i;
if (protocol_version < 29)
flag_ptr[7] = NULL;
- for (i = 0, flags = read_int(fd); flag_ptr[i]; i++) {
- int set = flags & (1 << i) ? 1 : 0;
+ else if (protocol_version < 30)
+ flag_ptr[9] = NULL;
+ tweaked_append = append_mode == 1;
+ tweaked_append_verify = append_mode == 2;
+#ifdef ICONV_OPTION
+ tweaked_iconv = iconv_opt != NULL;
+#endif
+ for (i = 0; flag_ptr[i]; i++) {
+ int set = batch_stream_flags & (1 << i) ? 1 : 0;
if (*flag_ptr[i] != set) {
- if (verbose) {
+ if (i == 9) {
+ rprintf(FERROR,
+ "%s specify the --iconv option to use this batch file.\n",
+ set ? "Please" : "Do not");
+ exit_cleanup(RERR_SYNTAX);
+ }
+ if (INFO_GTE(MISC, 1)) {
rprintf(FINFO,
"%sing the %s option to match the batchfile.\n",
set ? "Sett" : "Clear", flag_name[i]);
else if (xfer_dirs < 2)
xfer_dirs = 0;
}
+
+ if (tweaked_append)
+ append_mode = 1;
+ else if (tweaked_append_verify)
+ append_mode = 2;
}
-static void write_arg(int fd, char *arg)
+static int write_arg(int fd, char *arg)
{
char *x, *s;
+ int len, ret = 0;
if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
- write(fd, arg, x - arg + 1);
+ if (write(fd, arg, x - arg + 1) != x - arg + 1)
+ ret = -1;
arg += x - arg + 1;
}
if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
- write(fd, "'", 1);
+ if (write(fd, "'", 1) != 1)
+ ret = -1;
for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
- write(fd, s, x - s + 1);
- write(fd, "'", 1);
+ if (write(fd, s, x - s + 1) != x - s + 1
+ || write(fd, "'", 1) != 1)
+ ret = -1;
}
- write(fd, s, strlen(s));
- write(fd, "'", 1);
- return;
+ len = strlen(s);
+ if (write(fd, s, len) != len
+ || write(fd, "'", 1) != 1)
+ ret = -1;
+ return ret;
}
- write(fd, arg, strlen(arg));
+ len = strlen(arg);
+ if (write(fd, arg, len) != len)
+ ret = -1;
+
+ return ret;
}
static void write_filter_rules(int fd)
{
- struct filter_struct *ent;
+ filter_rule *ent;
write_sbuf(fd, " <<'#E#'\n");
for (ent = filter_list.head; ent; ent = ent->next) {
unsigned int plen;
- char *p = get_rule_prefix(ent->match_flags, "- ", 0, &plen);
+ char *p = get_rule_prefix(ent, "- ", 0, &plen);
write_buf(fd, p, plen);
write_sbuf(fd, ent->pattern);
- if (ent->match_flags & MATCHFLG_DIRECTORY)
+ if (ent->rflags & FILTRULE_DIRECTORY)
write_byte(fd, '/');
write_byte(fd, eol_nulls ? 0 : '\n');
}
* (hopefully) work. */
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
{
- int fd, i, len;
+ int fd, i, len, err = 0;
char *p, filename[MAXPATHLEN];
stringjoin(filename, sizeof filename,
S_IRUSR | S_IWUSR | S_IEXEC);
if (fd < 0) {
rsyserr(FERROR, errno, "Batch file %s open error",
- safe_fname(filename));
- exit_cleanup(1);
+ filename);
+ exit_cleanup(RERR_FILESELECT);
}
/* Write argvs info to BATCH.sh file */
- write_arg(fd, argv[0]);
+ if (write_arg(fd, argv[0]) < 0)
+ err = 1;
if (filter_list.head) {
if (protocol_version >= 29)
write_sbuf(fd, " --filter=._-");
i++;
continue;
}
- write(fd, " ", 1);
+ if (write(fd, " ", 1) != 1)
+ err = 1;
if (strncmp(p, "--write-batch", len = 13) == 0
|| strncmp(p, "--only-write-batch", len = 18) == 0) {
- write(fd, "--read-batch", 12);
+ if (write(fd, "--read-batch", 12) != 12)
+ err = 1;
if (p[len] == '=') {
- write(fd, "=", 1);
- write_arg(fd, p + len + 1);
+ if (write(fd, "=", 1) != 1
+ || write_arg(fd, p + len + 1) < 0)
+ err = 1;
}
- } else
- write_arg(fd, p);
+ } else {
+ if (write_arg(fd, p) < 0)
+ err = 1;
+ }
}
if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
p = argv[argc - 1];
- write(fd, " ${1:-", 6);
- write_arg(fd, p);
+ if (write(fd, " ${1:-", 6) != 6
+ || write_arg(fd, p) < 0)
+ err = 1;
write_byte(fd, '}');
if (filter_list.head)
write_filter_rules(fd);
- if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
+ if (write(fd, "\n", 1) != 1 || close(fd) < 0 || err) {
rsyserr(FERROR, errno, "Batch file %s write error",
- safe_fname(filename));
- exit_cleanup(1);
- }
-}
-
-void show_flist(int index, struct file_struct **fptr)
-{
- /* for debugging show_flist(flist->count, flist->files * */
-
- int i;
- for (i = 0; i < index; i++) {
- rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
- rprintf(FINFO, "flist->modtime=%#lx\n",
- (long unsigned) fptr[i]->modtime);
- rprintf(FINFO, "flist->length=%.0f\n",
- (double) fptr[i]->length);
- rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
- rprintf(FINFO, "flist->basename=%s\n",
- safe_fname(fptr[i]->basename));
- if (fptr[i]->dirname) {
- rprintf(FINFO, "flist->dirname=%s\n",
- safe_fname(fptr[i]->dirname));
- }
- if (am_sender && fptr[i]->dir.root) {
- rprintf(FINFO, "flist->dir.root=%s\n",
- safe_fname(fptr[i]->dir.root));
- }
+ filename);
+ exit_cleanup(RERR_FILEIO);
}
}
-
-/* for debugging */
-void show_argvs(int argc, char *argv[])
-{
- int i;
-
- rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc);
- for (i = 0; i < argc; i++)
- rprintf(FINFO, "i=%d,argv[i]=%s\n", i, safe_fname(argv[i]));
-}