mirror of
https://github.com/isc-projects/bind9.git
synced 2026-04-22 14:49:20 -04:00
2247. [doc] Sort doc/misc/options. [RT #17067]
This commit is contained in:
parent
8c76634f88
commit
f2d8c4a4c3
4 changed files with 57 additions and 7 deletions
2
CHANGES
2
CHANGES
|
|
@ -1,3 +1,5 @@
|
|||
2247. [doc] Sort doc/misc/options. [RT #17067]
|
||||
|
||||
2246. [bug] Make the startup of test servers (ans.pl) more
|
||||
robust. [RT #17147]
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
# $Id: Makefile.in,v 1.6 2007/06/18 23:47:34 tbox Exp $
|
||||
# $Id: Makefile.in,v 1.7 2007/09/24 04:21:59 marka Exp $
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -40,6 +40,7 @@ CFG_TEST = ../../bin/tests/cfg_test
|
|||
options: FORCE
|
||||
if test -x ${CFG_TEST} && \
|
||||
${CFG_TEST} --named --grammar | \
|
||||
${PERL} ${srcdir}/sort-options.pl | \
|
||||
${PERL} ${srcdir}/format-options.pl >$@.new ; then \
|
||||
mv -f $@.new $@ ; \
|
||||
else \
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
# $Id: format-options.pl,v 1.4 2007/06/19 23:47:13 tbox Exp $
|
||||
# $Id: format-options.pl,v 1.5 2007/09/24 04:21:59 marka Exp $
|
||||
|
||||
print <<END;
|
||||
|
||||
|
|
@ -26,11 +26,24 @@ END
|
|||
|
||||
# Break long lines
|
||||
while (<>) {
|
||||
chomp;
|
||||
s/\t/ /g;
|
||||
if (length >= 79) {
|
||||
m!^( *)!;
|
||||
my $indent = $1;
|
||||
s!^(.{0,75}) (.*)$!\1\n$indent \2!;
|
||||
my $line = $_;
|
||||
m!^( *)!;
|
||||
my $indent = $1;
|
||||
my $comment = "";
|
||||
if ( $line =~ m!//.*! ) {
|
||||
$comment = $&;
|
||||
$line =~ s!//.*!!;
|
||||
}
|
||||
print;
|
||||
my $start = "";
|
||||
while (length($line) >= 79 - length($comment)) {
|
||||
$_ = $line;
|
||||
# this makes sure that the comment has something in front of it
|
||||
$len = 75 - length($comment);
|
||||
m!^(.{0,$len}) (.*)$!;
|
||||
$start = $start.$1."\n";
|
||||
$line = $indent." ".$2;
|
||||
}
|
||||
print $start.$line.$comment."\n";
|
||||
}
|
||||
|
|
|
|||
34
doc/misc/sort-options.pl
Normal file
34
doc/misc/sort-options.pl
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
#!/bin/perl
|
||||
|
||||
sub sortlevel() {
|
||||
my @options = ();
|
||||
my $fin = "";
|
||||
my $i = 0;
|
||||
while (<>) {
|
||||
if (/^\s*};$/) {
|
||||
$fin = $_;
|
||||
# print 2, $_;
|
||||
last;
|
||||
}
|
||||
next if (/^$/);
|
||||
if (/{$/) {
|
||||
# print 3, $_;
|
||||
my $sec = $_;
|
||||
push(@options, $sec . sortlevel());
|
||||
} else {
|
||||
push(@options, $_);
|
||||
# print 1, $_;
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
my $result = "";
|
||||
foreach my $i (sort @options) {
|
||||
$result = ${result}.${i};
|
||||
$result = $result."\n" if ($i =~ /^[a-z]/i);
|
||||
# print 5, ${i};
|
||||
}
|
||||
$result = ${result}.${fin};
|
||||
return ($result);
|
||||
}
|
||||
|
||||
print sortlevel();
|
||||
Loading…
Reference in a new issue