X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8487f9cf29ac7beef852d6e760cf471db7f8da4a..42b06481c34b6b09a21c0a5eb27f1de443c4a036:/options.c

diff --git a/options.c b/options.c
index b49c1151..ea8f72b2 100644
--- a/options.c
+++ b/options.c
@@ -6,8 +6,9 @@
  * 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
- * 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
@@ -15,8 +16,7 @@
  * 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"
@@ -335,8 +335,8 @@ void usage(enum logcode F)
   rprintf(F,"     --devices               preserve device files (super-user only)\n");
   rprintf(F,"     --specials              preserve special files\n");
   rprintf(F," -D                          same as --devices --specials\n");
-  rprintf(F," -t, --times                 preserve times\n");
-  rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
+  rprintf(F," -t, --times                 preserve modification times\n");
+  rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
   rprintf(F,"     --super                 receiver attempts super-user activities\n");
 #ifdef SUPPORT_XATTRS
   rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
@@ -1186,7 +1186,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
 		case 'X':
 #ifdef SUPPORT_XATTRS
-			preserve_xattrs = 1;
+			preserve_xattrs++;
 			preserve_perms = 1;
 			break;
 #else
@@ -1677,8 +1677,11 @@ void server_options(char **args,int *argc)
 		argstr[x++] = 'A';
 #endif
 #ifdef SUPPORT_XATTRS
-	if (preserve_xattrs)
+	if (preserve_xattrs) {
 		argstr[x++] = 'X';
+		if (preserve_xattrs > 1)
+			argstr[x++] = 'X';
+	}
 #endif
 	if (recurse)
 		argstr[x++] = 'r';