extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-27 16:49:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up compiler selection code in /sbin/shorewall

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5823 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-03 14:47:57 +00:00
parent 850173ff54
commit 7ecfc1376c
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Shorewall-common/shorewall
View File

@ -220,10 +220,16 @@ get_config() {
# Run the appropriate compiler
#
compiler() {
local sc=/usr/share/shorewall-shell/compiler
local pc=/usr/share/shorewall-perl/compiler.pl
local command=$1
fatal_error() {
echo " ERROR: $@" >&2
exit 2
}
shift
#
# We've now set SHOREWALL_DIR so recalculate CONFIG_PATH
#
@ -237,13 +243,13 @@ compiler() {
set +a
compiler=shell
if [ -d /usr/share/shorewall-shell ]; then
if [ -d /usr/share/shorewall-perl ]; then
if [ -x $sc ]; then
if [ -x $pc ]; then
compiler=
else
compiler=shell
fi
elif [ -d /usr/share/shorewall-perl ]; then
elif [ -x $pc ]; then
compiler=perl
else
fatal_error "No shorewall compiler installed"
@ -251,7 +257,7 @@ compiler() {
if [ -z "$compiler" ]; then
#
# Read the appropriate shorewall.conf to learn the setting of SHOREWALL_COMPILER
# Both compilers installed. Read the appropriate shorewall.conf to learn the setting of SHOREWALL_COMPILER
#
config=$(find_file shorewall.conf)
@ -270,24 +276,27 @@ compiler() {
#
[ -n "$SHOREWALL_COMPILER" ] && compiler="$SHOREWALL_COMPILER"
fi
[ $command = exec ] || command=
case "$compiler" in
perl)
#
# Perl compiler -- set the appropriate Perl options
#
[ "$1" = debug ] && DEBUG=Yes && shift
debugflags="-w"
[ -n "$DEBUG" ] && debugflags='-wd'
[ -n "$PROFILE" ] && DEBUGFLAGS='-wd:DProf'
shift # Perl compiler doesn't need a command
perl $debugflags /usr/share/shorewall-perl/compiler.pl $@
[ "$1" = debug ] && debugflags='-wd' && shift
[ -n "$PROFILE" ] && debugflags='-wd:DProf'
shift # Perl compiler only takes the output file as a argument
$command perl $debugflags $pc $@
;;
shell)
#
# Shell compiler -- run it
#
$SHOREWALL_SHELL /usr/share/shorewall-shell/compiler $@
$command $SHOREWALL_SHELL $sc $@
;;
*)
startup_error "Invalid value ($SHOREWALL_COMPILER) for SHOREWALL_COMPILER"
@ -308,7 +317,7 @@ start_command() {
progress_message3 "Compiling..."
if compiler $debugging $nolock compile ${VARDIR}/.start; then
if compiler run $debugging $nolock compile ${VARDIR}/.start; then
${VARDIR}/.start $debugging start
rc=$?
else
@ -498,9 +507,7 @@ compile_command() {
progress_message3 "Compiling..."
compiler $debugging compile $file
exit
compiler exec $debugging compile $file
}
#
@ -572,9 +579,7 @@ check_command() {
progress_message3 "Checking..."
compiler $debugging $nolock check
exit
compiler exec $debugging $nolock check
}
#
@ -645,7 +650,7 @@ restart_command() {
progress_message3 "Compiling..."
if compiler $debugging $nolock compile ${VARDIR}/.restart; then
if compiler run $debugging $nolock compile ${VARDIR}/.restart; then
$SHOREWALL_SHELL ${VARDIR}/.restart $debugging restart
rc=$?
else
@ -713,7 +718,7 @@ refresh_command() {
progress_message3 "Compiling..."
if compiler $debugging $nolock compile ${VARDIR}/.refresh; then
if compiler run $debugging $nolock compile ${VARDIR}/.refresh; then
$SHOREWALL_SHELL ${VARDIR}/.refresh $debugging refresh
fi
@ -818,7 +823,7 @@ safe_commands() {
progress_message3 "Compiling..."
if ! compiler $debugging nolock compile ${VARDIR}/.$command; then
if ! compiler run $debugging nolock compile ${VARDIR}/.$command; then
status=$?
mutex_off
exit $status
@ -949,7 +954,7 @@ try_command() {
progress_message3 "Compiling..."
if ! compiler $debugging nolock compile ${VARDIR}/.$command; then
if ! compiler run $debugging nolock compile ${VARDIR}/.$command; then
status=$?
mutex_off
exit $status