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
+ Put --existing back in the main option summary.
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
bcb109e
..
eb0c49a
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-6,6
+6,7
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "zlib/zlib.h"
#include <time.h>
extern int am_sender;
#include <time.h>
extern int am_sender;
@@
-19,11
+20,14
@@
extern int preserve_uid;
extern int preserve_gid;
extern int always_checksum;
extern int do_compression;
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 int protocol_version;
extern char *batch_name;
extern struct filter_list_struct filter_list;
+static int tweaked_compress_level;
+
static int *flag_ptr[] = {
&recurse, /* 0 */
&preserve_uid, /* 1 */
static int *flag_ptr[] = {
&recurse, /* 0 */
&preserve_uid, /* 1 */
@@
-33,7
+37,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) */
- &
do_compression,
/* 8 (protocol 29) */
+ &
tweaked_compress_level,
/* 8 (protocol 29) */
NULL
};
NULL
};
@@
-54,6
+58,12
@@
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
+
/* Start the batch file with a bitmap of data-stream-affecting
* flags. */
if (protocol_version < 29)
/* Start the batch file with a bitmap of data-stream-affecting
* flags. */
if (protocol_version < 29)
@@
-88,6
+98,13
@@
void read_stream_flags(int fd)
else if (xfer_dirs < 2)
xfer_dirs = 0;
}
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)
}
static void write_arg(int fd, char *arg)
@@
-139,7
+156,7
@@
static void write_filter_rules(int fd)
* (hopefully) work. */
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
{
* (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,
char *p, filename[MAXPATHLEN];
stringjoin(filename, sizeof filename,
@@
-175,11
+192,12
@@
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
continue;
}
write(fd, " ", 1);
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);
write(fd, "--read-batch", 12);
- if (p[
13
] == '=') {
+ if (p[
len
] == '=') {
write(fd, "=", 1);
write(fd, "=", 1);
- write_arg(fd, p +
14
);
+ write_arg(fd, p +
len + 1
);
}
} else
write_arg(fd, p);
}
} else
write_arg(fd, p);