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

Changing what's escaped when printing.

Browse source 
With this patch the model is:

    - "print" cleans the data so that non-printable characters get
      escaped. This is not necessarily reversible.

    - to print in a reversible way, one can go through
      escape_string(); this escapes backslashes as well to make the
      decoding non-ambigious.

    - Logging always escapes similar to escape_string(), making it
      reversible.

Compared to master, we also change the escaping as follows:

    - We now only escape with "\xXX", no more "^X" or "\0". Exception:
      backslashes.

    - We escape backlashes as "\\".

    - There's no "alternative" output style anymore, i.e., fmt() '%A'
      qualifier is gone.

Baselines in testing/btest are updated, external tests not yet.

Addresses BIT-1333.
This commit is contained in:
Robin Sommer 2015-04-15 09:59:09 -07:00
parent e41c623ad0
commit 7344052b50
66 changed files with 397 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/BroString.cc
View file

@ -194,21 +194,6 @@ char* BroString::Render(int format, int* len) const
for ( int i = 0; i < n; ++i )
{
//if ( b[i] == '\0' && (format & ESC_NULL) )
// {
// *sp++ = '\\'; *sp++ = 'x'; *sp++ = '0'; *sp++ = '0';
// }
//
//else if ( b[i] == '\x7f' && (format & ESC_DEL) )
// {
// *sp++ = '^'; *sp++ = '?';
// }
//
//else if ( b[i] <= 26 && (format & ESC_LOW) )
// {
// *sp++ = '^'; *sp++ = b[i] + 'A' - 1;
// }
if ( b[i] == '\\' && (format & ESC_ESC) )
{
*sp++ = '\\'; *sp++ = '\\';