X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d3e182af0976f35cad31bd3aa08c8deaa20509b3..0f78b81511be65d8fe21af1e6ac674f9e80ac29d:/batch.c diff --git a/batch.c b/batch.c index 4c91f82f..d405f112 100644 --- a/batch.c +++ b/batch.c @@ -1,35 +1,57 @@ -/* -*- 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, 2005, 2006 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 2 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "rsync.h" +#include "zlib/zlib.h" #include -extern char *batch_name; -extern int delete_mode; -extern int delete_excluded; extern int eol_nulls; extern int recurse; +extern int xfer_dirs; extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_uid; extern int preserve_gid; extern int always_checksum; +extern int do_compression; +extern int def_compress_level; +extern int protocol_version; +extern char *batch_name; + +extern struct filter_list_struct filter_list; -extern struct exclude_list_struct exclude_list; +static int tweaked_compress_level; static int *flag_ptr[] = { - &recurse, - &preserve_uid, - &preserve_gid, - &preserve_links, - &preserve_devices, - &preserve_hard_links, - &always_checksum, + &recurse, /* 0 */ + &preserve_uid, /* 1 */ + &preserve_gid, /* 2 */ + &preserve_links, /* 3 */ + &preserve_devices, /* 4 */ + &preserve_hard_links, /* 5 */ + &always_checksum, /* 6 */ + &xfer_dirs, /* 7 (protocol 29) */ + &tweaked_compress_level,/* 8 (protocol 29) */ NULL }; @@ -41,6 +63,8 @@ static char *flag_name[] = { "--devices (-D)", "--hard-links (-H)", "--checksum (-c)", + "--dirs (-d)", + "--compress (-z)", NULL }; @@ -48,8 +72,16 @@ void write_stream_flags(int fd) { 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! +#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; @@ -61,15 +93,32 @@ void read_stream_flags(int fd) { int i, flags; + 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; if (*flag_ptr[i] != set) { - rprintf(FINFO, - "%sing the %s option to match the batchfile.\n", - set ? "Sett" : "Clear", flag_name[i]); + if (verbose) { + rprintf(FINFO, + "%sing the %s option to match the batchfile.\n", + set ? "Sett" : "Clear", flag_name[i]); + } *flag_ptr[i] = set; } } + if (protocol_version < 29) { + if (recurse) + xfer_dirs |= 1; + else if (xfer_dirs < 2) + 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; + } } static void write_arg(int fd, char *arg) @@ -95,19 +144,16 @@ static void write_arg(int fd, char *arg) write(fd, arg, strlen(arg)); } -static void write_excludes(int fd) +static void write_filter_rules(int fd) { - struct exclude_struct *ent; + struct filter_struct *ent; write_sbuf(fd, " <<'#E#'\n"); - for (ent = exclude_list.head; ent; ent = ent->next) { - char *p = ent->pattern; - if (ent->match_flags & MATCHFLG_INCLUDE) - write_buf(fd, "+ ", 2); - else if (((*p == '-' || *p == '+') && p[1] == ' ') - || *p == '#' || *p == ';') - write_buf(fd, "- ", 2); - write_sbuf(fd, p); + for (ent = filter_list.head; ent; ent = ent->next) { + unsigned int plen; + char *p = get_rule_prefix(ent->match_flags, "- ", 0, &plen); + write_buf(fd, p, plen); + write_sbuf(fd, ent->pattern); if (ent->match_flags & MATCHFLG_DIRECTORY) write_byte(fd, '/'); write_byte(fd, eol_nulls ? 0 : '\n'); @@ -124,7 +170,7 @@ static void write_excludes(int fd) * (hopefully) work. */ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt) { - int fd, i; + int fd, i, len; char *p, filename[MAXPATHLEN]; stringjoin(filename, sizeof filename, @@ -132,80 +178,54 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt) fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IEXEC); if (fd < 0) { - rsyserr(FERROR, errno, "Batch file %s open error", filename); + rsyserr(FERROR, errno, "Batch file %s open error", + filename); exit_cleanup(1); } /* Write argvs info to BATCH.sh file */ write_arg(fd, argv[0]); - if (exclude_list.head) - write_sbuf(fd, " --exclude-from=-"); + if (filter_list.head) { + if (protocol_version >= 29) + write_sbuf(fd, " --filter=._-"); + else + write_sbuf(fd, " --exclude-from=-"); + } for (i = 1; i < argc - file_arg_cnt; i++) { p = argv[i]; if (strncmp(p, "--files-from", 12) == 0 + || strncmp(p, "--filter", 8) == 0 || strncmp(p, "--include", 9) == 0 || strncmp(p, "--exclude", 9) == 0) { if (strchr(p, '=') == NULL) i++; continue; } + if (strcmp(p, "-f") == 0) { + i++; + continue; + } write(fd, " ", 1); - if (strncmp(p, "--write-batch", 13) == 0) { + if (strncmp(p, "--write-batch", len = 13) == 0 + || strncmp(p, "--only-write-batch", len = 18) == 0) { write(fd, "--read-batch", 12); - if (p[13] == '=') { + if (p[len] == '=') { write(fd, "=", 1); - write_arg(fd, p + 14); + write_arg(fd, p + len + 1); } } else write_arg(fd, p); } - if ((p = find_colon(argv[argc - 1])) != NULL) { - if (*++p == ':') - p++; - } else + if (!(p = check_for_hostspec(argv[argc - 1], &p, &i))) p = argv[argc - 1]; write(fd, " ${1:-", 6); write_arg(fd, p); write_byte(fd, '}'); - if (exclude_list.head) - write_excludes(fd); + if (filter_list.head) + write_filter_rules(fd); if (write(fd, "\n", 1) != 1 || close(fd) < 0) { - rsyserr(FERROR, errno, "Batch file %s write error", filename); + rsyserr(FERROR, errno, "Batch file %s write error", + 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", fptr[i]->basename); - if (fptr[i]->dirname) - rprintf(FINFO, "flist->dirname=%s\n", - fptr[i]->dirname); - if (fptr[i]->basedir) - rprintf(FINFO, "flist->basedir=%s\n", - fptr[i]->basedir); - } -} - -void show_argvs(int argc, char *argv[]) -{ - /* for debugging * */ - - int i; - rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc); - for (i = 0; i < argc; i++) { - /* if (argv[i]) */ - rprintf(FINFO, "i=%d,argv[i]=%s\n", i, argv[i]); - - } -}