LineageOS/android_external_rsync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle new def_compress_level setting.

Browse Source
This commit is contained in:
Wayne Davison
2005-10-26 16:48:07 +00:00
parent e8a8167ad9
commit 3cc185a088
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
batch.c
View File

@@ -6,6 +6,7 @@
*/ */
#include "rsync.h" #include "rsync.h"
#include "zlib/zlib.h"
#include <time.h> #include <time.h>
extern int am_sender; extern int am_sender;
@@ -19,11 +20,14 @@ extern int preserve_uid;
extern int preserve_gid; extern int preserve_gid;
extern int always_checksum; extern int always_checksum;
extern int do_compression; extern int do_compression;
extern int def_compress_level;
extern int protocol_version; extern int protocol_version;
extern char *batch_name; extern char *batch_name;
extern struct filter_list_struct filter_list; extern struct filter_list_struct filter_list;
static int tweaked_compress_level;
static int *flag_ptr[] = { static int *flag_ptr[] = {
&recurse, /* 0 */ &recurse, /* 0 */
&preserve_uid, /* 1 */ &preserve_uid, /* 1 */
@@ -33,7 +37,7 @@ static int *flag_ptr[] = {
&preserve_hard_links, /* 5 */ &preserve_hard_links, /* 5 */
&always_checksum, /* 6 */ &always_checksum, /* 6 */
&xfer_dirs, /* 7 (protocol 29) */ &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 /* Start the batch file with a bitmap of data-stream-affecting
* flags. */ * flags. */
if (protocol_version < 29) if (protocol_version < 29)
@@ -88,6 +98,13 @@ void read_stream_flags(int fd)
else if (xfer_dirs < 2) else if (xfer_dirs < 2)
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;
}
} }
static void write_arg(int fd, char *arg) static void write_arg(int fd, char *arg)