Update rrsync & its opt-culling script.

diff --git a/packaging/cull_options b/packaging/cull_options
index 91e64e76b001837b7647cf62302d7ecaea390ae2..c32a84dd6371622f3c89f89de7b56359d94feee2 100755 (executable)
--- a/packaging/cull_options
+++ b/packaging/cull_options
@@ -23,6 +23,7 @@ our %long_opt = ( # These include some extra long-args that BackupPC uses:
     'perms' => 0,
     'recursive' => 0,
     'times' => 0,
+    'write-devices' => -1,
 );
 our $last_long_opt;
 
@@ -39,10 +40,10 @@ while (<IN>) {
        $last_long_opt = $1;
        $long_opt{$1} = 0 unless exists $long_opt{$1};
     } elsif (defined($last_long_opt)
-       && /\Qargs[ac++]\E = ([^["\s]+);/ && $1 ne 'dest_option') {
+       && /\Qargs[ac++]\E = ([^["\s]+);/) {
        $long_opt{$last_long_opt} = 2;
        undef $last_long_opt;
-    } elsif (/dest_option = "--([^"]+)"/) {
+    } elsif (/return "--([^"]+-dest)";/) {
        $long_opt{$1} = 2;
        undef $last_long_opt;
     } elsif (/\Qasprintf(\E[^,]+, "--([^"=]+)=/ || /\Qargs[ac++]\E = "--([^"=]+)=/ || /fmt = .*: "--([^"=]+)=/) {

diff --git a/support/rrsync b/support/rrsync
index a538fbbad89ff32e8978e092b764c7e35b29792e..c9bf39f3a859b78f5532166d4b8af8f910396de9 100644 (file)
--- a/support/rrsync
+++ b/support/rrsync
@@ -62,7 +62,7 @@ die "$0 reading from write-only server not allowed\n" if $only eq 'w' && $am_sen
 # To disable a short-named option, add its letter to this string:
 our $short_disabled = 's';
 
-our $short_no_arg = 'ACDEHIJKLORSUWXbcdgklmnoprstuvxyz'; # DO NOT REMOVE ANY
+our $short_no_arg = 'ACDEHIJKLORSUWXbcdgklmnopqrstuvxyz'; # 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:
@@ -76,6 +76,7 @@ our %long_opt = (
   'checksum-choice' => 1,
   'checksum-seed' => 1,
   'compare-dest' => 2,
+  'compress-choice' => 1,
   'compress-level' => 1,
   'copy-dest' => 2,
   'copy-unsafe-links' => 0,
@@ -120,6 +121,7 @@ our %long_opt = (
   'no-relative' => 0,
   'no-specials' => 0,
   'numeric-ids' => 0,
+  'old-compress' => 0,
   'one-file-system' => 0,
   'only-write-batch' => 1,
   'open-noatime' => 0,