extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-14 13:47:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pretty up 'show macros' display with long macro names

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7809 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-01 17:14:08 +00:00
parent 1a164793bd
commit 9ee254bd07
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/shorewall-lite
View File

@ -552,9 +552,11 @@ banner="Shorewall Lite $version Status at $HOSTNAME -"
case $(echo -e) in case $(echo -e) in
-e*) -e*)
RING_BELL="echo \a" RING_BELL="echo \a"
ECHO_E="echo"
;; ;;
*) *)
RING_BELL="echo -e \a" RING_BELL="echo -e \a"
ECHO_E="echo -e"
;; ;;
esac esac

40
Shorewall-perl/Shorewall/Config.pm
View File

@ -1277,18 +1277,18 @@ sub default_yes_no ( $$ ) {
} }
} }
my %validlevels = ( debug => 7, my %validlevels = ( DEBUG => 7,
info => 6, INFO => 6,
notice => 5, NOTICE => 5,
warning => 4, WARNING => 4,
warn => 4, WARN => 4,
err => 3, ERR => 3,
error => 3, ERROR => 3,
crit => 2, CRIT => 2,
alert => 1, ALERT => 1,
emerg => 0, EMERG => 0,
panic => 0, PANIC => 0,
none => '', NONE => '',
ULOG => 'ULOG', ULOG => 'ULOG',
NFLOG => 'NFLOG'); NFLOG => 'NFLOG');
@ -1302,7 +1302,7 @@ sub level_error( $ ) {
} }
sub validate_level( $ ) { sub validate_level( $ ) {
my $level = $_[0]; my $level = uc $_[0];
if ( defined $level && $level ne '' ) { if ( defined $level && $level ne '' ) {
$level =~ s/!$//; $level =~ s/!$//;
@ -1409,8 +1409,8 @@ sub report_capabilities() {
sub which( $ ) { sub which( $ ) {
my $prog = $_[0]; my $prog = $_[0];
for my $dir ( split /:/, $config{PATH} ) { for ( split /:/, $config{PATH} ) {
return "$dir/$prog" if -x "$dir/$prog"; return "$_/$prog" if -x "$_/$prog";
} }
''; '';
@ -1436,17 +1436,15 @@ sub load_kernel_modules( ) {
if ( $moduleloader && open_file 'modules' ) { if ( $moduleloader && open_file 'modules' ) {
my %loadedmodules; my %loadedmodules;
for ( split /,/, $config{DONT_LOAD} ) { $loadedmodules{$_}++ for split /,/, $config{DONT_LOAD};
$loadedmodules{$_} = 1;
}
progress_message "Loading Modules..."; progress_message "Loading Modules...";
open LSMOD , '-|', 'lsmod' or fatal_error "Can't run lsmod"; open LSMOD , '-|', 'lsmod' or fatal_error "Can't run lsmod";
while ( $currentline = <LSMOD> ) { while ( <LSMOD> ) {
my $module = ( split( /\s+/, $currentline, 2 ) )[0]; my $module = ( split( /\s+/, $_, 2 ) )[0];
$loadedmodules{$module} = 1 unless $module eq 'Module' $loadedmodules{$module}++ unless $module eq 'Module'
} }
close LSMOD; close LSMOD;

2
tools/web/publish
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl #STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl
WEBSITE=/home/teastep/Shorewall/Website WEBSITE=/home/teastep/Shorewall/Website
HTMFILES=" HTMFILES="
6to4.htm 6to4.htm