Changed the way version numbering of pre-releases will be done in

[rsync/rsync.git] / support / cull_options

diff --git a/support/cull_options b/support/cull_options
index dbbfc78..3ef470d 100755 (executable)
--- a/support/cull_options
+++ b/support/cull_options
@@ -4,13 +4,19 @@
 # is included in the rrsync script.
 use strict;
 
-our(%short_no_arg, %short_with_num, %long_opt);
+our %short_no_arg;
+our %short_with_num;
+our %long_opt = (
+    'no-i-r' => 0,
+    'fake-super' => 0,
+    'log-file' => 3,
+);
 our $last_long_opt;
 
 open(IN, '../options.c') or die "Unable to open ../options.c: $!\n";
 
 while (<IN>) {
-    if (/\Qargstr[x++]\E = '(.)'/) {
+    if (/\Qargstr[x++]\E = '([^.ie])'/) {
        $short_no_arg{$1} = 1;
        undef $last_long_opt;
     } elsif (/\Qasprintf(\E[^,]+, "-([a-zA-Z0-9])\%l?[ud]"/) {
@@ -39,10 +45,10 @@ my $short_with_num = join('', sort keys %short_with_num);
 print <<EOT;
 
 # 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 = '$short_no_arg'; # DO NOT REMOVE ANY
 our \$short_with_num = '$short_with_num'; # DO NOT REMOVE ANY
@@ -55,7 +61,7 @@ EOT
 
 foreach my $opt (sort keys %long_opt) {
     my $val = $long_opt{$opt};
-    $val = 1 if $opt =~ /^max-/;
+    $val = 1 if $opt =~ /^(max-|min-)/;
     $val = 3 if $opt eq 'files-from';
     $val = '$ro ? -1 : ' . $val if $opt =~ /^remove-/;
     print "  '$opt' => $val,\n";