Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed our supplied getnameinfo()'s ability to do a reverse lookup,
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
68ff957
..
ac89583
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-200
7
Wayne Davison
+ * Copyright (C) 2004-200
8
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
*
* 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
@@
-35,7
+35,6
@@
extern int preserve_acls;
extern int preserve_xattrs;
extern int always_checksum;
extern int do_compression;
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 int inplace;
extern int append_mode;
extern int protocol_version;
@@
-46,7
+45,8
@@
extern char *iconv_opt;
extern struct filter_list_struct filter_list;
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 tweaked_append;
static int tweaked_append_verify;
static int tweaked_iconv;
@@
-60,7
+60,7
@@
static int *flag_ptr[] = {
&preserve_hard_links, /* 5 */
&always_checksum, /* 6 */
&xfer_dirs, /* 7 (protocol 29) */
&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) */
&tweaked_iconv, /* 9 (protocol 30) */
&preserve_acls, /* 10 (protocol 30) */
&preserve_xattrs, /* 11 (protocol 30) */
@@
-93,11
+93,6
@@
void write_stream_flags(int fd)
{
int i, flags;
{
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
tweaked_append = append_mode == 1;
tweaked_append_verify = append_mode == 2;
#ifdef ICONV_OPTION
tweaked_append = append_mode == 1;
tweaked_append_verify = append_mode == 2;
#ifdef ICONV_OPTION
@@
-106,10
+101,6
@@
void write_stream_flags(int fd)
/* Start the batch file with a bitmap of data-stream-affecting
* flags. */
/* Start the batch file with a bitmap of data-stream-affecting
* flags. */
- if (protocol_version < 29)
- flag_ptr[7] = NULL;
- else if (protocol_version < 30)
- flag_ptr[9] = NULL;
for (i = 0, flags = 0; flag_ptr[i]; i++) {
if (*flag_ptr[i])
flags |= 1 << i;
for (i = 0, flags = 0; flag_ptr[i]; i++) {
if (*flag_ptr[i])
flags |= 1 << i;
@@
-119,7
+110,12
@@
void write_stream_flags(int fd)
void read_stream_flags(int fd)
{
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;
if (protocol_version < 29)
flag_ptr[7] = NULL;
@@
-130,16
+126,16
@@
void read_stream_flags(int fd)
#ifdef ICONV_OPTION
tweaked_iconv = iconv_opt != NULL;
#endif
#ifdef ICONV_OPTION
tweaked_iconv = iconv_opt != NULL;
#endif
- for (i = 0
, flags = read_int(fd)
; flag_ptr[i]; i++) {
- int set = flags & (1 << i) ? 1 : 0;
+ for (i = 0; flag_ptr[i]; i++) {
+ int set =
batch_stream_
flags & (1 << i) ? 1 : 0;
if (*flag_ptr[i] != set) {
if (i == 9) {
if (*flag_ptr[i] != set) {
if (i == 9) {
- rprintf(FERROR,
+ rprintf(FERROR,
"%s specify the --iconv option to use this batch file.\n",
set ? "Please" : "Do not");
exit_cleanup(RERR_SYNTAX);
}
"%s specify the --iconv option to use this batch file.\n",
set ? "Please" : "Do not");
exit_cleanup(RERR_SYNTAX);
}
- if (
verbose
) {
+ if (
INFO_GTE(MISC, 1)
) {
rprintf(FINFO,
"%sing the %s option to match the batchfile.\n",
set ? "Sett" : "Clear", flag_name[i]);
rprintf(FINFO,
"%sing the %s option to match the batchfile.\n",
set ? "Sett" : "Clear", flag_name[i]);
@@
-154,12
+150,6
@@
void read_stream_flags(int fd)
xfer_dirs = 0;
}
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)
if (tweaked_append)
append_mode = 1;
else if (tweaked_append_verify)