Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 03:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

If a field value contains the separator, that is now escape with hex

Browse source 
characters.
This commit is contained in:
Robin Sommer 2011-03-09 16:26:11 -08:00
parent c6d20dbfdf
commit cb9e0a5d5a
6 changed files with 96 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/LogWriterAscii.cc
View file

@ -11,7 +11,10 @@ LogWriterAscii::LogWriterAscii()
output_to_stdout = BifConst::LogAscii::output_to_stdout;
include_header = BifConst::LogAscii::include_header;
separator = strdup(BifConst::LogAscii::separator->CheckString());
separator_len = BifConst::LogAscii::separator->Len();
separator = new char[separator_len];
memcpy(separator, BifConst::LogAscii::separator->Bytes(), separator_len);
}
LogWriterAscii::~LogWriterAscii()
@ -19,7 +22,7 @@ LogWriterAscii::~LogWriterAscii()
if ( file )
fclose(file);
free(separator);
delete [] separator;
}
bool LogWriterAscii::DoInit(string path, int num_fields, const LogField* const * fields)
@ -46,7 +49,7 @@ bool LogWriterAscii::DoInit(string path, int num_fields, const LogField* const *
if ( fputs(field->name.c_str(), file) == EOF )
goto write_error;
if ( fputs(separator, file) == EOF )
if ( fwrite(separator, separator_len, 1, file) != 1 )
goto write_error;
}
@ -74,11 +77,12 @@ void LogWriterAscii::DoFinish()
bool LogWriterAscii::DoWrite(int num_fields, const LogField* const * fields, LogVal** vals)
{
ODesc desc(DESC_READABLE);
desc.SetEscape(separator, separator_len);
for ( int i = 0; i < num_fields; i++ )
{
if ( i > 0 )
desc.Add(separator);
desc.AddRaw(separator, separator_len);
LogVal* val = vals[i];
const LogField* field = fields[i];