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

Make a separate 'indent' function for 'append_file'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5333 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-30 21:48:13 +00:00
parent 8cefd52c95
commit 1bc2bed68e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shorewall/compiler
View File

@ -96,20 +96,28 @@ progress_message_and_save()
}
#
# If a filename is passed, then echo the contents of that file indented by $INDENT and perform INCLUDE processing.
# If no filename is passed, then echo the contents of STDIN intended by $INDENT but do not perform INCLUDE processing.
# Echo the contents of the passed file indented by $INDENT
#
indent() {
if [ -n "$INDENT" ]; then
if [ $# -ge 1 ]; then
read_file $1 0 | eval sed \'s\/^/"$INDENT"\/\' -
if [ -n "$HAVEAWK" ]; then
eval awk \''BEGIN { indent=1; }; /^\s*$/ { print ""; indent=1; next; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1
else
eval sed \'s\/^/"$INDENT"\/\'
eval sed \'s\/^/"$INDENT"\/\' $1
fi
elif [ $# -ge 1 ]; then
read_file $1 0
else
cat
cat $1
fi
}
#
# Echo the contents of the passed file indented by $INDENT and perform INCLUDE processing.
#
indent1() {
if [ -n "$INDENT" ]; then
read_file $1 0 | eval sed \'s\/^/"$INDENT"\/\' -
else
read_file $1 0
fi
}
@ -129,7 +137,7 @@ append_file() # $1 = File Name
*)
if [ -f $user_exit ]; then
save_progress_message "Processing $user_exit ..."
indent $user_exit >&3
indent1 $user_exit >&3
save_command
fi
;;