diff options
| author | Wayne Davison <wayned@samba.org> | 2010-02-17 14:55:34 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2010-02-17 14:55:34 -0800 |
| commit | 5d8dcd1edbbfdd691a3a84e9191a96584cae34e1 (patch) | |
| tree | a690074fbac0b2b675f9bdf7ed71162bd788c80b | |
| parent | afccb3d3263b4867eb0a22cf29a3bb75f4cf0d71 (diff) | |
| download | android_external_rsync-5d8dcd1edbbfdd691a3a84e9191a96584cae34e1.tar.gz android_external_rsync-5d8dcd1edbbfdd691a3a84e9191a96584cae34e1.tar.bz2 android_external_rsync-5d8dcd1edbbfdd691a3a84e9191a96584cae34e1.zip | |
Write out the right compat_flags value into the batch file.
| -rw-r--r-- | compat.c | 2 | ||||
| -rw-r--r-- | io.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -24,6 +24,7 @@ int remote_protocol = 0; int file_extra_cnt = 0; /* count of file-list extras that everyone gets */ int inc_recurse = 0; +int compat_flags = 0; int use_safe_inc_flist = 0; extern int am_server; @@ -247,7 +248,6 @@ void setup_protocol(int f_out,int f_in) exit_cleanup(RERR_PROTOCOL); } } else if (protocol_version >= 30) { - int compat_flags; if (am_server) { compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0; #ifdef CAN_SET_SYMLINK_TIMES @@ -50,6 +50,7 @@ extern int file_total; extern int file_old_total; extern int list_only; extern int read_batch; +extern int compat_flags; extern int protect_args; extern int checksum_seed; extern int protocol_version; @@ -2318,7 +2319,7 @@ void start_write_batch(int fd) * is involved. */ write_int(batch_fd, protocol_version); if (protocol_version >= 30) - write_byte(batch_fd, inc_recurse); + write_byte(batch_fd, compat_flags); write_int(batch_fd, checksum_seed); if (am_sender) |