More global variable renaming

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall/lib.cli

@@ -245,13 +245,13 @@ logwatch() # $1 = timeout -- if negative, prompt each time that
 	if [ "$rejects" != "$oldrejects" ]; then
 	    oldrejects="$rejects"
 
-	    $RING_BELL
+	    $g_ring_bell
 
 	    packet_log 40
 
 	    if [ "$pause" = "Yes" ]; then
 		echo
-		echo $ECHO_N 'Enter any character to continue: '
+		echo $g_echo_n 'Enter any character to continue: '
 		read foo
 	    else
 		timed_read
@@ -440,7 +440,7 @@ show_command() {
 	    if [ ${#macro} -gt 10 ]; then
 		echo "   $macro  ${foo#\#}"
 	    else
-		$ECHO_E "   $macro  \t${foo#\#}"
+		$g_echo_e "   $macro  \t${foo#\#}"
 	    fi
 	fi
     }

Shorewall/shorewall

@@ -1584,6 +1584,7 @@ MUTEX_TIMEOUT=
 SHAREDIR=/usr/share/shorewall
 CONFDIR=/etc/shorewall
 export PRODUCT="Shorewall"
+export RECOVERING=
 
 [ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir
 
@@ -1593,13 +1594,10 @@ if [ ! -f ${VARDIR}/firewall ]; then
     [ -f ${VARDIR}/.restore ] && cp -f ${VARDIR}/.restore ${VARDIR}/firewall 
 fi
 
-FIREWALL=${VARDIR}/firewall
+g_firewall=${VARDIR}/firewall
-LIBRARIES="$SHAREDIR/lib.base $SHAREDIR/lib.cli"
-VERSION_FILE=$SHAREDIR/version
-RECOVERING=
-export RECOVERING
 
-for library in $LIBRARIES; do
+libraries="$SHAREDIR/lib.base $SHAREDIR/lib.cli"
+for library in $libraries; do
     if [ -f $library ]; then
 	. $library
     else
@@ -1608,11 +1606,12 @@ for library in $LIBRARIES; do
     fi
 done
 
-if [ -f $VERSION_FILE ]; then
+version_file=$SHAREDIR/version
-    version=$(cat $VERSION_FILE)
+if [ -f $version_file ]; then
+    version=$(cat $version_file)
 else
     echo "   ERROR: Shorewall is not properly installed" >&2
-    echo "	 The file $VERSION_FILE does not exist"  >&2
+    echo "	 The file $version_file does not exist"  >&2
     exit 1
 fi
 
@@ -1620,21 +1619,21 @@ banner="Shorewall-$version Status at $HOSTNAME -"
 
 case $(echo -e) in
     -e*)
-	RING_BELL="echo \a"
+	g_ring_bell="echo \a"
-	ECHO_E="echo"
+	g_echo_e="echo"
 	;;
     *)
-	RING_BELL="echo -e \a"
+	g_ring_bell="echo -e \a"
-	ECHO_E="echo -e"
+	g_echo_e="echo -e"
 	;;
 esac
 
 case $(echo -n "Testing") in
     -n*)
-	ECHO_N=
+	g_echo_n=
 	;;
     *)
-	ECHO_N=-n
+	g_echo_n=-n
 	;;
 esac
 
@@ -1649,10 +1648,10 @@ case "$COMMAND" in
     stop|clear)
 	get_config
 	[ $# -ne 1 ] && usage 1
-	[ -x $FIREWALL ] || fatal_error "Shorewall has never been started"
+	[ -x $g_firewall ] || fatal_error "Shorewall has never been started"
 	export NOROUTES
 	mutex_on
-	$SHOREWALL_SHELL $FIREWALL $g_debugging $nolock $COMMAND
+	$SHOREWALL_SHELL $g_firewall $g_debugging $nolock $COMMAND
 	mutex_off
 	;;
     reset)
@@ -1660,8 +1659,8 @@ case "$COMMAND" in
 	export NOROUTES
 	shift
 	mutex_on
-	[ -x $FIREWALL ] || fatal_error "Shorewall has never been started"
+	[ -x $g_firewall ] || fatal_error "Shorewall has never been started"
-	$SHOREWALL_SHELL $FIREWALL $g_debugging $nolock reset $@
+	$SHOREWALL_SHELL $g_firewall $g_debugging $nolock reset $@
 	mutex_off
 	;;
     compile)

Shorewall6/lib.cli

@@ -226,13 +226,13 @@ logwatch() # $1 = timeout -- if negative, prompt each time that
 	if [ "$rejects" != "$oldrejects" ]; then
 	    oldrejects="$rejects"
 
-	    $RING_BELL
+	    $g_ring_bell
 
 	    packet_log 40
 
 	    if [ "$pause" = "Yes" ]; then
 		echo
-		echo $ECHO_N 'Enter any character to continue: '
+		echo $g_echo_n 'Enter any character to continue: '
 		read foo
 	    else
 		timed_read
@@ -353,7 +353,7 @@ show_command() {
 	    if [ ${#macro} -gt 10 ]; then
 		echo "   $macro  ${foo#\#}"
 	    else
-		$ECHO_E "   $macro  \t${foo#\#}"
+		$g_echo_e "   $macro  \t${foo#\#}"
 	    fi
 	fi
     }

Shorewall6/shorewall6

@@ -1497,6 +1497,7 @@ MUTEX_TIMEOUT=
 SHAREDIR=/usr/share/shorewall6
 CONFDIR=/etc/shorewall6
 export PRODUCT="Shorewall6"
+export RECOVERING=
 
 [ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir
 
@@ -1506,13 +1507,10 @@ if [ ! -f ${VARDIR}/firewall ]; then
     [ -f ${VARDIR}/.restore ] && cp -f ${VARDIR}/.restore ${VARDIR}/firewall 
 fi
 
-FIREWALL=${VARDIR}/firewall
+g_firewall=${VARDIR}/firewall
-LIBRARIES="$SHAREDIR/lib.base $SHAREDIR/lib.cli"
-VERSION_FILE=$SHAREDIR/version
-RECOVERING=
-export RECOVERING
 
-for library in $LIBRARIES; do
+libraries="$SHAREDIR/lib.base $SHAREDIR/lib.cli"
+for library in $libraries; do
     if [ -f $library ]; then
 	. $library
     else
@@ -1521,11 +1519,12 @@ for library in $LIBRARIES; do
     fi
 done
 
-if [ -f $VERSION_FILE ]; then
+version_file=$SHAREDIR/version
-    version=$(cat $VERSION_FILE)
+if [ -f $version_file ]; then
+    version=$(cat $version_file)
 else
     echo "   ERROR: Shorewall6 is not properly installed" >&2
-    echo "	 The file $VERSION_FILE does not exist"  >&2
+    echo "	 The file $version_file does not exist"  >&2
     exit 1
 fi
 
@@ -1533,21 +1532,21 @@ banner="Shorewall6-$version Status at $HOSTNAME -"
 
 case $(echo -e) in
     -e*)
-	RING_BELL="echo \a"
+	g_ring_bell="echo \a"
-	ECHO_E="echo"
+	g_echo_e="echo"
 	;;
     *)
-	RING_BELL="echo -e \a"
+	g_ring_bell="echo -e \a"
-	ECHO_E="echo -e"
+	g_echo_e="echo -e"
 	;;
 esac
 
 case $(echo -n "Testing") in
     -n*)
-	ECHO_N=
+	g_echo_n=
 	;;
     *)
-	ECHO_N=-n
+	g_echo_n=-n
 	;;
 esac
 
@@ -1562,10 +1561,10 @@ case "$COMMAND" in
     stop|clear)
 	[ $# -ne 1 ] && usage 1
 	get_config
-	[ -x $FIREWALL ] || fatal_error "Shorewall6 has never been started"
+	[ -x $g_firewall ] || fatal_error "Shorewall6 has never been started"
 	export NOROUTES
 	mutex_on
-	$SHOREWALL_SHELL $FIREWALL $g_debugging $nolock $COMMAND
+	$SHOREWALL_SHELL $g_firewall $g_debugging $nolock $COMMAND
 	mutex_off
 	;;
     reset)
@@ -1573,8 +1572,8 @@ case "$COMMAND" in
 	export NOROUTES
 	shift
 	mutex_on
-	[ -x $FIREWALL ] || fatal_error "Shorewall6 has never been started"
+	[ -x $g_firewall ] || fatal_error "Shorewall6 has never been started"
-	$SHOREWALL_SHELL $FIREWALL $g_debugging $nolock reset $@
+	$SHOREWALL_SHELL $g_firewall $g_debugging $nolock reset $@
 	mutex_off
 	;;
     compile)