also remove carriage returns, fix for csv

This commit is contained in:
Sietse van der Molen 2016-02-12 12:40:31 +01:00
parent b2e4df60ca
commit 394f186000
1 changed files with 2 additions and 3 deletions

View File

@ -453,11 +453,10 @@ fileout_footer() {
}
fileout() { # ID, SEVERITY, FINDING
local finding="$5"
local finding=$(strip_lf "$(newline_to_spaces "$(strip_quote "$3")")")
if "$do_json"; then
"$FIRST_FINDING" || echo "," >> $JSONFILE
finding=$(newline_to_spaces "$(strip_quote "$3")")
echo -e "
{
\"id\" : \"$1\",
@ -469,7 +468,7 @@ fileout() { # ID, SEVERITY, FINDING
fi
# does the following do any sanitization?
if "$do_csv"; then
echo -e \""$1\"",\"$NODE/$NODEIP\",\"$PORT"\",\""$2"\",\"$(strip_quote "$3")\"" >>$CSVFILE
echo -e \""$1\"",\"$NODE/$NODEIP\",\"$PORT"\",\""$2"\",\""$finding"\"" >>$CSVFILE
fi
"$FIRST_FINDING" && FIRST_FINDING=false
}