Fixed a problem with --fake-super not getting the fully tweaked new_mode

[rsync/rsync.git] / support / rrsync

diff --git a/support/rrsync b/support/rrsync
index 1c314ee..e1ae6ec 100644 (file)
--- a/support/rrsync
+++ b/support/rrsync
@@ -45,22 +45,24 @@ die "$0 -ro: sending to read-only server not allowed\n" if $ro && !$am_sender;
 ### START of options data produced by the cull_options script. ###
 
 # These options are the only options that rsync might send to the server,
-# and only in the option/arg format that the stock rsync produces.
+# and only in the option format that the stock rsync produces.
 
 # To disable a short-named option, add its letter to this string:
-our $short_disabled = '';
+our $short_disabled = 's';
 
-our $short_no_arg = 'CDHIKLORSWbcdglnoprtuvxz'; # DO NOT REMOVE ANY
+our $short_no_arg = 'ACDEHIKLORSWXbcdgklmnoprstuvxz'; # DO NOT REMOVE ANY
 our $short_with_num = 'B'; # DO NOT REMOVE ANY
 
 # To disable a long-named option, change its value to a -1.  The values mean:
 # 0 = the option has no arg; 1 = the arg doesn't need any checking; 2 = only
 # check the arg when receiving; and 3 = always check the arg.
 our %long_opt = (
+  'append' => 0,
   'backup-dir' => 2,
   'bwlimit' => 1,
   'checksum-seed' => 1,
   'compare-dest' => 2,
+  'compress-level' => 1,
   'copy-dest' => 2,
   'copy-unsafe-links' => 0,
   'daemon' => 0,
@@ -68,6 +70,7 @@ our %long_opt = (
   'delete' => 0,
   'delete-after' => 0,
   'delete-before' => 0,
+  'delete-delay' => 0,
   'delete-during' => 0,
   'delete-excluded' => 0,
   'existing' => 0,
@@ -75,6 +78,7 @@ our %long_opt = (
   'force' => 0,
   'from0' => 0,
   'fuzzy' => 0,
+  'iconv' => 1,
   'ignore-errors' => 0,
   'ignore-existing' => 0,
   'inplace' => 0,
@@ -83,19 +87,27 @@ our %long_opt = (
   'log-format' => 1,
   'max-delete' => 1,
   'max-size' => 1,
+  'min-size' => 1,
   'modify-window' => 1,
+  'no-i-r' => 0,
   'no-implied-dirs' => 0,
+  'no-r' => 0,
   'no-relative' => 0,
+  'no-specials' => 0,
   'numeric-ids' => 0,
   'only-write-batch' => 1,
   'partial' => 0,
   'partial-dir' => 2,
   'remove-sent-files' => $ro ? -1 : 0,
+  'remove-source-files' => $ro ? -1 : 0,
   'safe-links' => 0,
   'sender' => 0,
   'server' => 0,
   'size-only' => 0,
+  'skip-compress' => 1,
+  'specials' => 0,
   'suffix' => 1,
+  'super' => 0,
   'temp-dir' => 2,
   'timeout' => 1,
 );
@@ -117,7 +129,8 @@ my(@opts, @args);
 my $in_options = 1;
 my $last_opt = '';
 my $check_type;
-foreach (split(/(?<!\\)\s+/, $command)) {
+while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
+  $_ = $1;
   if ($check_type) {
     push(@opts, check_arg($last_opt, $_, $check_type));
     $check_type = 0;
@@ -126,7 +139,7 @@ foreach (split(/(?<!\\)\s+/, $command)) {
     if ($_ eq '.') {
       $in_options = 0;
     } else {
-      next if /^-$short_no_arg+$/o || /^-$short_with_num\d+$/o;
+      next if /^-$short_no_arg+(e\d+\.\d+)?$/o || /^-$short_with_num\d+$/o;
 
       my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
       my $disabled;