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
- Increased the SUBPROTOCOL_VERSION to 4 due to the new dir-ndx logic.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
b49c115
..
1a110e1
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-6,7
+6,7
@@
* Copyright (C) 2002-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2002-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
+ * it under the terms of the GNU General Public License version
3
as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@
-15,8
+15,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"
@@
-1186,7
+1185,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
case 'X':
#ifdef SUPPORT_XATTRS
case 'X':
#ifdef SUPPORT_XATTRS
- preserve_xattrs
= 1
;
+ preserve_xattrs
++
;
preserve_perms = 1;
break;
#else
preserve_perms = 1;
break;
#else
@@
-1677,8
+1676,11
@@
void server_options(char **args,int *argc)
argstr[x++] = 'A';
#endif
#ifdef SUPPORT_XATTRS
argstr[x++] = 'A';
#endif
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
+ if (preserve_xattrs)
{
argstr[x++] = 'X';
argstr[x++] = 'X';
+ if (preserve_xattrs > 1)
+ argstr[x++] = 'X';
+ }
#endif
if (recurse)
argstr[x++] = 'r';
#endif
if (recurse)
argstr[x++] = 'r';