*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-2007 Wayne Davison
+ * 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 version 3 as
- * published by the Free Software Foundation.
+ * 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
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 def_compress_level;
+extern int inplace;
+extern int append_mode;
extern int protocol_version;
extern char *batch_name;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
+#endif
extern struct filter_list_struct filter_list;
-static int tweaked_compress_level;
+int batch_stream_flags;
+
+static int tweaked_append;
+static int tweaked_append_verify;
+static int tweaked_iconv;
static int *flag_ptr[] = {
&recurse, /* 0 */
&preserve_hard_links, /* 5 */
&always_checksum, /* 6 */
&xfer_dirs, /* 7 (protocol 29) */
- &tweaked_compress_level,/* 8 (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;
-#if Z_DEFAULT_COMPRESSION == -1
- tweaked_compress_level = do_compression ? def_compress_level + 2 : 0;
-#else
-#error internal logic error! Fix def_compress_level logic above and below too!
+ 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]);
xfer_dirs = 0;
}
- if (tweaked_compress_level == 0 || tweaked_compress_level == 2)
- do_compression = 0;
- else {
- do_compression = 1;
- def_compress_level = tweaked_compress_level - 2;
- }
+ 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)
* (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,
if (fd < 0) {
rsyserr(FERROR, errno, "Batch file %s open error",
filename);
- exit_cleanup(1);
+ 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",
filename);
- exit_cleanup(1);
+ exit_cleanup(RERR_FILEIO);
}
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff