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

Move '-e' to after 'compile|generate'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3291 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-15 16:35:09 +00:00
parent aacb7c6f74
commit c882d8cb3d
1 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Shorewall/shorewall
View File

@ -502,18 +502,18 @@ help()
# #
usage() # $1 = exit status usage() # $1 = exit status
{ {
echo "Usage: $(basename $0) [debug|trace] [nolock] [ -x ] [ -q ] [ -f ] [ -v ] [ -n ] [ -e ] <command>" echo "Usage: $(basename $0) [debug|trace] [nolock] [ -x ] [ -q ] [ -f ] [ -v ] [ -n ] <command>"
echo "where <command> is one of:" echo "where <command> is one of:"
echo " add <interface>[:<host-list>] ... <zone>" echo " add <interface>[:<host-list>] ... <zone>"
echo " allow <address> ..." echo " allow <address> ..."
echo " check [ <directory> ]" echo " check [ <directory> ]"
echo " clear" echo " clear"
echo " compile [ <directory name> ] <file name>" echo " compile [ -e ] [ -p ] [ <directory name> ] <file name>"
echo " delete <interface>[:<host-list>] ... <zone>" echo " delete <interface>[:<host-list>] ... <zone>"
echo " drop <address> ..." echo " drop <address> ..."
echo " dump" echo " dump"
echo " forget [ <file name> ]" echo " forget [ <file name> ]"
echo " generate [ <directory name> ] <file name>" echo " generate [ -e ] [-p ] [ <directory name> ] <file name>"
echo " help [ <command > | host | address ]" echo " help [ <command > | host | address ]"
echo " hits" echo " hits"
echo " ipcalc { <address>/<vlsm> | <address> <netmask> }" echo " ipcalc { <address>/<vlsm> | <address> <netmask> }"
@ -844,28 +844,66 @@ case "$1" in
exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1 exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1
;; ;;
compile|generate) compile|generate)
file= shift
case $# in
1) done=0
while [ $done -eq 0 ]; do
[ $# -eq 0 ] && usage 1
option=$1
case $option in
-*)
option=${option#-}
[ -z "$option" ] && usage 1
while [ -n "$option" ]; do
case $option in
e*)
EXPORT=Yes
option=${option#e}
;;
q*)
QUIET=$(($QUIET + 1 ))
option=${option#q}
;;
p*)
exportPROGRAM=Yes
option=${option#p}
;;
*)
usage 1 usage 1
;; ;;
2) esac
file=$2 done
shift
;; ;;
3) *)
done=1
;;
esac
done
file=
case $# in
1)
file=$1
;;
2)
[ -n "$SHOREWALL_DIR" ] && usage 2 [ -n "$SHOREWALL_DIR" ] && usage 2
if [ ! -d $2 ]; then if [ ! -d $1 ]; then
if [ -e $2 ]; then if [ -e $1 ]; then
echo "$2 is not a directory" >&2 && exit 2 echo "$1 is not a directory" >&2 && exit 2
else else
echo "Directory $2 does not exist" >&2 && exit 2 echo "Directory $1 does not exist" >&2 && exit 2
fi fi
fi fi
SHOREWALL_DIR=$2 SHOREWALL_DIR=$1
export SHOREWALL_DIR export SHOREWALL_DIR
file=$3 file=$2
;; ;;
*) *)
usage 1 usage 1