holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Create standard error messages in the CLI

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-04-27 10:13:24 -07:00
parent 200ad3f874
commit 47edfaf093
2 changed files with 124 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
Shorewall-core/lib.cli
View File

@ -731,6 +731,22 @@ list_zone() {
done done
} }
option_error() {
fatal_error "The $COMMAND command does not accept this option: -$1"
}
too_many_arguments() {
fatal_error "Too many arguments: $1"
}
missing_argument() {
fatal_error "Missing argument"
}
missing_option_value() {
fatal_error "The $1 option requires a value"
}
version_command() { version_command() {
local finished local finished
finished=0 finished=0
@ -755,7 +771,7 @@ version_command() {
option=${option#a} option=${option#a}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -767,7 +783,7 @@ version_command() {
esac esac
done done
[ $# -gt 0 ] && usage 1 [ $# -gt 0 ] && too_many_arguments
if [ -n "$all" ]; then if [ -n "$all" ]; then
echo "shorewall-core: $(cat ${SHAREDIR}/shorewall/coreversion)" echo "shorewall-core: $(cat ${SHAREDIR}/shorewall/coreversion)"
@ -1065,7 +1081,7 @@ show_connections() {
shift shift
conntrack -f ipv4 -L $@ | show_connections_filter conntrack -f ipv4 -L $@ | show_connections_filter
else else
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments
if [ -f /proc/net/ip_conntrack ]; then if [ -f /proc/net/ip_conntrack ]; then
cat /proc/net/ip_conntrack | show_connections_filter cat /proc/net/ip_conntrack | show_connections_filter
else else
@ -1078,7 +1094,7 @@ show_connections() {
echo echo
conntrack -f ipv6 -L $@ | show_connections_filter conntrack -f ipv6 -L $@ | show_connections_filter
else else
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments
if [ -f /proc/sys/net/netfilter/nf_conntrack_count -a -f /proc/sys/net/nf_conntrack ]; then if [ -f /proc/sys/net/netfilter/nf_conntrack_count -a -f /proc/sys/net/nf_conntrack ]; then
local count=$(cat /proc/sys/net/netfilter/nf_conntrack_count) local count=$(cat /proc/sys/net/netfilter/nf_conntrack_count)
local max=$(cat /proc/sys/net/netfilter/nf_conntrack_max) local max=$(cat /proc/sys/net/netfilter/nf_conntrack_max)
@ -1199,7 +1215,7 @@ show_command() {
option=${option#f} option=${option#f}
;; ;;
t) t)
[ $# -eq 1 ] && usage 1 [ $# -eq 1 ] && missing_option_value -t
case $2 in case $2 in
mangle|nat|filter|raw|rawpost) mangle|nat|filter|raw|rawpost)
@ -1227,7 +1243,7 @@ show_command() {
option=${option#b} option=${option#b}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -1249,37 +1265,37 @@ show_command() {
eval show_connections $@ $g_pager eval show_connections $@ $g_pager
;; ;;
nat) nat)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_nat $g_pager eval show_nat $g_pager
;; ;;
raw) raw)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_raw $g_pager eval show_raw $g_pager
;; ;;
rawpost) rawpost)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_rawpost $g_pager eval show_rawpost $g_pager
;; ;;
tos|mangle) tos|mangle)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_mangle $g_pager eval show_mangle $g_pager
;; ;;
log) log)
[ $# -gt 2 ] && usage 1 [ $# -gt 2 ] && too_many_arguments $2
setup_logread setup_logread
eval show_log $g_pager eval show_log $g_pager
;; ;;
tc) tc)
[ $# -gt 2 ] && usage 1 [ $# -gt 2 ] && too_many_arguments $2
eval show_tc $@ $g_pager eval show_tc $@ $g_pager
;; ;;
classifiers|filters) classifiers|filters)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_classifiers_command $g_pager eval show_classifiers_command $g_pager
;; ;;
zones) zones)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
if [ -f ${VARDIR}/zones ]; then if [ -f ${VARDIR}/zones ]; then
echo "$g_product $SHOREWALL_VERSION Zones at $g_hostname - $(date)" echo "$g_product $SHOREWALL_VERSION Zones at $g_hostname - $(date)"
echo echo
@ -1302,7 +1318,7 @@ show_command() {
fi fi
;; ;;
capabilities) capabilities)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
determine_capabilities determine_capabilities
VERBOSITY=2 VERBOSITY=2
if [ -n "$g_filemode" ]; then if [ -n "$g_filemode" ]; then
@ -1312,11 +1328,11 @@ show_command() {
fi fi
;; ;;
ip) ip)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_ip_addresses $g_pager eval show_ip_addresses $g_pager
;; ;;
routing) routing)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_routing_command $g_pager eval show_routing_command $g_pager
;; ;;
config) config)
@ -1345,26 +1361,26 @@ show_command() {
echo $VARDIR; echo $VARDIR;
;; ;;
policies) policies)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_policies $g_pager eval show_policies $g_pager
;; ;;
ipa) ipa)
[ $g_family -eq 4 ] || usage 1 [ $g_family -eq 4 ] || fatal_error "'show ipa' is now available in $g_product"
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_ipa $g_pager eval show_ipa $g_pager
;; ;;
marks) marks)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
echo "$g_product $SHOREWALL_VERSION Mark Layout at $g_hostname - $(date)" echo "$g_product $SHOREWALL_VERSION Mark Layout at $g_hostname - $(date)"
echo echo
[ -f ${VARDIR}/marks ] && cat ${VARDIR}/marks; [ -f ${VARDIR}/marks ] && cat ${VARDIR}/marks;
;; ;;
nfacct) nfacct)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_nfacct_command $g_pager eval show_nfacct_command $g_pager
;; ;;
arptables) arptables)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
resolve_arptables resolve_arptables
if [ -n "$arptables" -a -x $arptables ]; then if [ -n "$arptables" -a -x $arptables ]; then
eval show_arptables $g_pager eval show_arptables $g_pager
@ -1373,22 +1389,22 @@ show_command() {
fi fi
;; ;;
event) event)
[ $# -gt 1 ] || usage 1 [ $# -gt 1 ] || too_many_arguments $2
echo "$g_product $SHOREWALL_VERSION events at $g_hostname - $(date)" echo "$g_product $SHOREWALL_VERSION events at $g_hostname - $(date)"
echo echo
shift shift
show_events $@ show_events $@
;; ;;
events) events)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_events_command $g_pager eval show_events_command $g_pager
;; ;;
bl|blacklists) bl|blacklists)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_blacklists $g_pager eval show_blacklists $g_pager
;; ;;
opens) opens)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
echo "$g_product $SHOREWALL_VERSION Temporarily opened connections at $g_hostname - $(date)" echo "$g_product $SHOREWALL_VERSION Temporarily opened connections at $g_hostname - $(date)"
if chain_exists dynamic; then if chain_exists dynamic; then
@ -1404,12 +1420,12 @@ show_command() {
*) *)
case $1 in case $1 in
actions) actions)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_actions_sorted $g_pager eval show_actions_sorted $g_pager
return return
;; ;;
macro) macro)
[ $# -ne 2 ] && usage 1 [ $# -ne 2 ] && too_many_arguments $2
for directory in $(split $CONFIG_PATH); do for directory in $(split $CONFIG_PATH); do
if [ -f ${directory}/macro.$2 ]; then if [ -f ${directory}/macro.$2 ]; then
echo "Shorewall $SHOREWALL_VERSION Macro $2 at $g_hostname - $(date)" echo "Shorewall $SHOREWALL_VERSION Macro $2 at $g_hostname - $(date)"
@ -1421,7 +1437,7 @@ show_command() {
return return
;; ;;
macros) macros)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && too_many_arguments $2
eval show_macros $g_pager eval show_macros $g_pager
return return
;; ;;
@ -1432,7 +1448,7 @@ show_command() {
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
if [ $1 = dynamic -a $# -gt 1 ]; then if [ $1 = dynamic -a $# -gt 1 ]; then
shift shift
[ $# -eq 1 ] || usage 1 [ $# -eq 1 ] || too_many_arguments $2
list_zone $1 list_zone $1
return; return;
fi fi
@ -1546,7 +1562,7 @@ do_dump_command() {
option=${option#c} option=${option#c}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -1565,7 +1581,7 @@ do_dump_command() {
[ $VERBOSITY -lt 2 ] && VERBOSITY=2 [ $VERBOSITY -lt 2 ] && VERBOSITY=2
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
[ $# -eq 0 ] || usage 1 [ $# -eq 0 ] || too_many_arguments $1
clear_term clear_term
echo "$g_product $SHOREWALL_VERSION Dump at $g_hostname - $(date)" echo "$g_product $SHOREWALL_VERSION Dump at $g_hostname - $(date)"
echo echo
@ -1760,7 +1776,7 @@ restore_command() {
option=${option#C} option=${option#C}
;; ;;
*) *)
usage 1 option_error
;; ;;
esac esac
done done
@ -1780,7 +1796,7 @@ restore_command() {
validate_restorefile '<restore file>' validate_restorefile '<restore file>'
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -2386,7 +2402,7 @@ hits_command() {
option=${option#t} option=${option#t}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -2398,7 +2414,7 @@ hits_command() {
esac esac
done done
[ $# -eq 0 ] || usage 1 [ $# -eq 0 ] || too_many_arguments $1
clear_term clear_term
echo "$g_product $SHOREWALL_VERSION Hits at $g_hostname - $(date)" echo "$g_product $SHOREWALL_VERSION Hits at $g_hostname - $(date)"
@ -2455,7 +2471,7 @@ hits_command() {
# #
allow_command() { allow_command() {
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
[ $# -eq 1 ] && usage 1 [ $# -eq 1 ] && missing_argument
if product_is_started ; then if product_is_started ; then
local which local which
which='-s' which='-s'
@ -2525,8 +2541,6 @@ logwatch_command() {
-*) -*)
option=${option#-} option=${option#-}
[ -z "$option" ] && usage 1
while [ -n "$option" ]; do while [ -n "$option" ]; do
case $option in case $option in
v*) v*)
@ -2546,7 +2560,7 @@ logwatch_command() {
option= option=
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -2565,7 +2579,7 @@ logwatch_command() {
elif [ $# -eq 0 ]; then elif [ $# -eq 0 ]; then
logwatch 30 logwatch 30
else else
usage 1 too_many_arguments $2
fi fi
} }
@ -3392,7 +3406,7 @@ status_command() {
option=${option#i} option=${option#i}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -3404,7 +3418,7 @@ status_command() {
esac esac
done done
[ $# -eq 0 ] || usage 1 [ $# -eq 0 ] || missing_argument
[ $VERBOSITY -ge 1 ] && echo "${g_product}-$SHOREWALL_VERSION Status at $g_hostname - $(date)" && echo [ $VERBOSITY -ge 1 ] && echo "${g_product}-$SHOREWALL_VERSION Status at $g_hostname - $(date)" && echo
show_status show_status
@ -3498,7 +3512,7 @@ save_command() {
option=${option#C} option=${option#C}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -3518,7 +3532,7 @@ save_command() {
validate_restorefile '<restore file>' validate_restorefile '<restore file>'
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -3537,6 +3551,9 @@ save_command() {
forget_command() { forget_command() {
case $# in case $# in
0)
missing_argument
;;
1) 1)
;; ;;
2) 2)
@ -3544,7 +3561,7 @@ forget_command() {
validate_restorefile '<restore file>' validate_restorefile '<restore file>'
;; ;;
*) *)
usage 1 too_many_arguments $3
;; ;;
esac esac
@ -3566,7 +3583,7 @@ ipcalc_command() {
local address local address
local vlsm local vlsm
[ $g_family -eq 6 ] && usage 1 [ $g_family -eq 6 ] && fatal_error "$g_product does not support the ipcalc command"
if [ $# -eq 2 ]; then if [ $# -eq 2 ]; then
address=${2%/*} address=${2%/*}
@ -3574,13 +3591,15 @@ ipcalc_command() {
elif [ $# -eq 3 ]; then elif [ $# -eq 3 ]; then
address=$2 address=$2
vlsm=$(ip_vlsm $3) vlsm=$(ip_vlsm $3)
elif [ $# -eq 0 ]; then
missing_argument
else else
usage 1 too_many_arguments $4
fi fi
valid_address $address || fatal_error "Invalid IP address: $address" valid_address $address || fatal_error "Invalid IP address: $address"
[ -z "$vlsm" ] && usage 2 [ -z "$vlsm" ] && fatal_error "Missing VLSM"
[ "x$address" = "x$vlsm" ] && usage 2 [ "x$address" = "x$vlsm" ] && "Invalid VLSM"
[ $vlsm -gt 32 ] && fatal_error "Invalid VLSM: /$vlsm" [ $vlsm -gt 32 ] && fatal_error "Invalid VLSM: /$vlsm"
address=$address/$vlsm address=$address/$vlsm
@ -3594,7 +3613,7 @@ ipcalc_command() {
iprange_command() { iprange_command() {
local range local range
[ $g_family -eq 6 ] && usage 1 [ $g_family -eq 6 ] && fatal_error "$g_product does not support the iprange command"
range='' range=''
@ -3612,15 +3631,19 @@ iprange_command() {
ip_range $range ip_range $range
;; ;;
*) *)
usage 1 fatal_error "Invalid ip range: $range"
;; ;;
esac esac
} }
ipdecimal_command() { ipdecimal_command() {
[ $# -eq 2 ] || usage 1 if [ $# eq 1 ]; then
missing_argument
else
[ $# -eq 2 ] || too_many_arguments $3
fi
[ $g_family -eq 6 ] && usage 1 [ $g_family -eq 6 ] && fatal_error "$g_product does not support the iprange command"
case $2 in case $2 in
*.*.*.*) *.*.*.*)
@ -3928,7 +3951,7 @@ start_command() {
option=${option%p} option=${option%p}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -3944,7 +3967,7 @@ start_command() {
0) 0)
;; ;;
*) *)
usage 1 too_many_arguments $1
;; ;;
esac esac
@ -3988,7 +4011,7 @@ restart_command() {
option=${option#C} option=${option#C}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -4004,7 +4027,7 @@ restart_command() {
0) 0)
;; ;;
*) *)
usage 1 too_many_arguments $1
;; ;;
esac esac
@ -4220,7 +4243,8 @@ shorewall_cli() {
while [ -n "$option" ]; do while [ -n "$option" ]; do
case $option in case $option in
c) c)
[ $# -eq 1 -o -n "$g_lite" ] && usage 1 [ $# -eq 1 ] && missing_option_value -c
[ -n "$g_lite" ] && fatal_error "$g_product does not support the -c option"
if [ ! -d $2 ]; then if [ ! -d $2 ]; then
if [ -e $2 ]; then if [ -e $2 ]; then
@ -4235,7 +4259,7 @@ shorewall_cli() {
shift shift
;; ;;
e*) e*)
[ -n "$g_lite" ] && usage 1 [ -n "$g_lite" ] && fatal_error "$g_product does not support the -e option"
g_export=Yes g_export=Yes
option=${option#e} option=${option#e}
;; ;;
@ -4297,7 +4321,7 @@ shorewall_cli() {
option= option=
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -4362,7 +4386,7 @@ shorewall_cli() {
start_command $@ start_command $@
;; ;;
stop|clear) stop|clear)
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && too_many_arguments $2
get_config get_config
[ -x $g_firewall ] || fatal_error "$g_product has never been started" [ -x $g_firewall ] || fatal_error "$g_product has never been started"
[ -n "$g_nolock" ] || mutex_on [ -n "$g_nolock" ] || mutex_on
@ -4419,7 +4443,7 @@ shorewall_cli() {
dump_command $@ dump_command $@
;; ;;
hits) hits)
[ $g_family -eq 6 ] && usage 1 [ $g_family -eq 6 ] && fatal_error "$g_product does not support the hits command"
get_config Yes No Yes get_config Yes No Yes
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
shift shift
@ -4437,19 +4461,19 @@ shorewall_cli() {
drop) drop)
get_config get_config
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
[ $# -eq 1 ] && usage 1 [ $# -eq 1 ] && missing_argument
drop_command $@ drop_command $@
;; ;;
logdrop) logdrop)
get_config get_config
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
[ $# -eq 1 ] && usage 1 [ $# -eq 1 ] && missing_argument
logdrop_command $@ logdrop_command $@
;; ;;
reject|logreject) reject|logreject)
get_config get_config
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
[ $# -eq 1 ] && usage 1 [ $# -eq 1 ] && missing_argument
reject_command $@ reject_command $@
;; ;;
open|close) open|close)
@ -4522,7 +4546,7 @@ shorewall_cli() {
run_it $g_firewall $g_debugging call $@ run_it $g_firewall $g_debugging call $@
fi fi
else else
usage 1 missing_argument
fi fi
;; ;;
help) help)
@ -4540,7 +4564,7 @@ shorewall_cli() {
noiptrace_command $@ noiptrace_command $@
;; ;;
savesets) savesets)
[ $# -eq 1 ] || usage 1 [ $# -eq 1 ] || too_many_arguments $2
get_config get_config
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
savesets1 savesets1
@ -4549,7 +4573,7 @@ shorewall_cli() {
if [ -z "$g_lite" ]; then if [ -z "$g_lite" ]; then
compiler_command $@ compiler_command $@
else else
usage 1 fatal_error "Invalid command: $COMMAND"
fi fi
;; ;;
esac esac

58
Shorewall/lib.cli-std
View File

@ -604,7 +604,7 @@ start_command() {
option=${option#C} option=${option#C}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -620,7 +620,8 @@ start_command() {
0) 0)
;; ;;
1) 1)
[ -n "$g_shorewalldir" -o -n "$g_fast" ] && usage 2 [ -n "$g_shorewalldir" ] && fatal_error "A directory has already been specified: $1"
[ -n "$g_fast" ] && fatal_error "Directory may not be specified with the -f option"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -634,7 +635,7 @@ start_command() {
AUTOMAKE= AUTOMAKE=
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -663,8 +664,6 @@ compile_command() {
shift shift
option=${option#-} option=${option#-}
[ -z "$option" ] && usage 1
while [ -n "$option" ]; do while [ -n "$option" ]; do
case $option in case $option in
e*) e*)
@ -701,7 +700,7 @@ compile_command() {
option= option=
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -723,7 +722,7 @@ compile_command() {
[ -d "$g_file" ] && fatal_error "$g_file is a directory" [ -d "$g_file" ] && fatal_error "$g_file is a directory"
;; ;;
2) 2)
[ -n "$g_shorewalldir" -a -z "$g_export" ] && usage 2 [ -n "$g_shorewalldir" -a -z "$g_export" ] && fatal_error "A directory has already been specified: $1"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -737,7 +736,7 @@ compile_command() {
g_file=$2 g_file=$2
;; ;;
*) *)
usage 1 too_many_arguments $3
;; ;;
esac esac
@ -791,7 +790,7 @@ check_command() {
option=${option#i} option=${option#i}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -807,7 +806,7 @@ check_command() {
0) 0)
;; ;;
1) 1)
[ -n "$g_shorewalldir" -a -z "$g_export" ] && usage 2 [ -n "$g_shorewalldir" -a -z "$g_export" ] && fatal_error "A directory has already been specified: $1"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -820,7 +819,7 @@ check_command() {
g_shorewalldir=$(resolve_file $1) g_shorewalldir=$(resolve_file $1)
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -883,7 +882,7 @@ update_command() {
option=${option#A} option=${option#A}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -899,7 +898,7 @@ update_command() {
0) 0)
;; ;;
1) 1)
[ -n "$g_shorewalldir" ] && usage 2 [ -n "$g_shorewalldir" ] && fatal_error "A directory has already been specified: $1"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -912,7 +911,7 @@ update_command() {
g_shorewalldir=$(resolve_file $1) g_shorewalldir=$(resolve_file $1)
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -977,7 +976,7 @@ restart_command() {
option=${option#C} option=${option#C}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -993,7 +992,7 @@ restart_command() {
0) 0)
;; ;;
1) 1)
[ -n "$g_shorewalldir" ] && usage 2 [ -n "$g_shorewalldir" ] && fatal_error "A directory has already been specified: $1"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -1008,7 +1007,7 @@ restart_command() {
AUTOMAKE= AUTOMAKE=
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -1086,7 +1085,7 @@ refresh_command() {
fi fi
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -1169,7 +1168,7 @@ safe_commands() {
shift; shift;
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -1185,7 +1184,7 @@ safe_commands() {
0) 0)
;; ;;
1) 1)
[ -n "$g_shorewalldir" ] && usage 2 [ -n "$g_shorewalldir" ] && fatal_error "A directory has already been specified: $1"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -1198,7 +1197,7 @@ safe_commands() {
g_shorewalldir=$(resolve_file $1) g_shorewalldir=$(resolve_file $1)
;; ;;
*) *)
usage 1 too_many_arguments $2
;; ;;
esac esac
@ -1286,7 +1285,7 @@ try_command() {
timeout= timeout=
handle_directory() { handle_directory() {
[ -n "$g_shorewalldir" ] && usage 2 [ -n "$g_shorewalldir" ] && fatal_error "A directory has already been specified: $1"
if [ ! -d $1 ]; then if [ ! -d $1 ]; then
if [ -e $1 ]; then if [ -e $1 ]; then
@ -1316,7 +1315,7 @@ try_command() {
option=${option#n} option=${option#n}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -1330,7 +1329,7 @@ try_command() {
case $# in case $# in
0) 0)
usage 1 missing_argument
;; ;;
1) 1)
handle_directory $1 handle_directory $1
@ -1341,7 +1340,7 @@ try_command() {
timeout=$2 timeout=$2
;; ;;
*) *)
usage 1 too_many_arguments $3
;; ;;
esac esac
@ -1480,7 +1479,7 @@ remote_reload_command() # $* = original arguments less the command.
option=${option#i} option=${option#i}
;; ;;
*) *)
usage 1 option_error $option
;; ;;
esac esac
done done
@ -1493,6 +1492,9 @@ remote_reload_command() # $* = original arguments less the command.
done done
case $# in case $# in
0)
missing_argument
;;
1) 1)
g_shorewalldir="." g_shorewalldir="."
system=$1 system=$1
@ -1502,7 +1504,7 @@ remote_reload_command() # $* = original arguments less the command.
system=$2 system=$2
;; ;;
*) *)
usage 1 too_many_arguments $3
;; ;;
esac esac
@ -1742,7 +1744,7 @@ compiler_command() {
safe_commands $@ safe_commands $@
;; ;;
*) *)
usage 1 fatal_error "Invalid command: $COMMAND"
;; ;;
esac esac