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
Added the --protect-args (-s) option, and made parse_arguments()
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
c5eee15
..
fb00274
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-6,8
+6,9
@@
* Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 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
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,8
+16,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-31,10
+31,13
@@
extern int am_sender;
extern int local_server;
extern int inplace;
extern int recurse;
extern int local_server;
extern int inplace;
extern int recurse;
+extern int use_qsort;
extern int allow_inc_recurse;
extern int allow_inc_recurse;
+extern int relative_paths;
+extern int append_mode;
extern int fuzzy_basis;
extern int read_batch;
extern int fuzzy_basis;
extern int read_batch;
-extern int
max_delete
;
+extern int
implied_dirs
;
extern int delay_updates;
extern int checksum_seed;
extern int basis_dir_cnt;
extern int delay_updates;
extern int checksum_seed;
extern int basis_dir_cnt;
@@
-44,7
+47,6
@@
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
extern int preserve_xattrs;
extern int preserve_gid;
extern int preserve_acls;
extern int preserve_xattrs;
-extern int preserve_hard_links;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
extern int delete_excluded;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
extern int delete_excluded;
@@
-55,6
+57,9
@@
extern char *partial_dir;
extern char *dest_option;
extern struct filter_list_struct filter_list;
extern char *dest_option;
extern struct filter_list_struct filter_list;
+/* These index values are for the file-list's extra-attribute array. */
+int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
+
/* The server makes sure that if either side only supports a pre-release
* version of a protocol, that both sides must speak a compatible version
* of that protocol for it to be advertised as available. */
/* The server makes sure that if either side only supports a pre-release
* version of a protocol, that both sides must speak a compatible version
* of that protocol for it to be advertised as available. */
@@
-62,13
+67,19
@@
static void check_sub_protocol(void)
{
char *dot;
int their_protocol, their_sub;
{
char *dot;
int their_protocol, their_sub;
+#if SUBPROTOCOL_VERSION != 0
int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
+#else
+ int our_sub = 0;
+#endif
if (!shell_cmd || !(dot = strchr(shell_cmd, '.'))
|| !(their_protocol = atoi(shell_cmd))
|| !(their_sub = atoi(dot+1))) {
if (!shell_cmd || !(dot = strchr(shell_cmd, '.'))
|| !(their_protocol = atoi(shell_cmd))
|| !(their_sub = atoi(dot+1))) {
+#if SUBPROTOCOL_VERSION != 0
if (our_sub)
protocol_version--;
if (our_sub)
protocol_version--;
+#endif
return;
}
return;
}
@@
-79,7
+90,7
@@
static void check_sub_protocol(void)
}
if (their_protocol > protocol_version)
}
if (their_protocol > protocol_version)
- their_sub = 0; /* 0 == final version */
+ their_sub = 0; /* 0 == final version
of older protocol
*/
if (their_sub != our_sub)
protocol_version--;
}
if (their_sub != our_sub)
protocol_version--;
}
@@
-91,13
+102,13
@@
void setup_protocol(int f_out,int f_in)
else
file_extra_cnt++;
if (preserve_uid)
else
file_extra_cnt++;
if (preserve_uid)
-
preserve_uid
= ++file_extra_cnt;
+
uid_ndx
= ++file_extra_cnt;
if (preserve_gid)
if (preserve_gid)
-
preserve_gid
= ++file_extra_cnt;
+
gid_ndx
= ++file_extra_cnt;
if (preserve_acls && !am_sender)
if (preserve_acls && !am_sender)
-
preserve_acls
= ++file_extra_cnt;
+
acls_ndx
= ++file_extra_cnt;
if (preserve_xattrs)
if (preserve_xattrs)
-
preserve_xattrs
= ++file_extra_cnt;
+
xattrs_ndx
= ++file_extra_cnt;
if (remote_protocol == 0) {
if (am_server && !local_server)
if (remote_protocol == 0) {
if (am_server && !local_server)
@@
-140,13
+151,8
@@
void setup_protocol(int f_out,int f_in)
}
if (protocol_version < 30) {
}
if (protocol_version < 30) {
- if (max_delete == 0 && am_sender) {
- rprintf(FERROR,
- "--max-delete=0 requires protocol 30 or higher"
- " (negotiated %d).\n",
- protocol_version);
- exit_cleanup(RERR_PROTOCOL);
- }
+ if (append_mode == 1)
+ append_mode = 2;
if (preserve_acls && !local_server) {
rprintf(FERROR,
"--acls requires protocol 30 or higher"
if (preserve_acls && !local_server) {
rprintf(FERROR,
"--acls requires protocol 30 or higher"
@@
-203,8
+209,9
@@
void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
- if (recurse && allow_inc_recurse
&& !preserve_hard_links
+ if (recurse && allow_inc_recurse
&& !delete_before && !delete_after && !delay_updates
&& !delete_before && !delete_after && !delay_updates
+ && (!relative_paths || implied_dirs) && !use_qsort
&& !prune_empty_dirs)
inc_recurse = 1;
need_messages_from_generator = 1;
&& !prune_empty_dirs)
inc_recurse = 1;
need_messages_from_generator = 1;