hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the logging function to inject a line terminator when a log mask changes without a line terminator

Browse Source
This commit is contained in:
hyunghwan.chung 2016-10-13 07:28:38 +00:00
parent 835919c4fe
commit bec8ee7254
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stix/lib/logfmt.c
View File

@ -192,6 +192,13 @@ static int put_ooch (stix_t* stix, stix_oow_t mask, stix_ooch_t ch, stix_oow_t l
if (stix->log.len > 0 && stix->log.last_mask != mask) if (stix->log.len > 0 && stix->log.last_mask != mask)
{ {
/* the mask has changed. commit the buffered text */ /* the mask has changed. commit the buffered text */
/* TODO: HANDLE LINE ENDING CONVENTION BETTER... */
if (stix->log.ptr[stix->log.len - 1] != '\n')
{
/* no line ending - append a line terminator */
stix->log.ptr[stix->log.len++] = '\n';
}
stix->vmprim.log_write (stix, stix->log.last_mask, stix->log.ptr, stix->log.len); stix->vmprim.log_write (stix, stix->log.last_mask, stix->log.ptr, stix->log.len);
stix->log.len = 0; stix->log.len = 0;
} }
@ -224,7 +231,7 @@ redo:
} }
stix->log.ptr = tmp; stix->log.ptr = tmp;
stix->log.capa = newcapa; stix->log.capa = newcapa - 1; /* -1 to handle line ending injection more easily */
} }
while (len > 0) while (len > 0)
@ -244,6 +251,13 @@ static int put_oocs (stix_t* stix, stix_oow_t mask, const stix_ooch_t* ptr, stix
if (stix->log.len > 0 && stix->log.last_mask != mask) if (stix->log.len > 0 && stix->log.last_mask != mask)
{ {
/* the mask has changed. commit the buffered text */ /* the mask has changed. commit the buffered text */
/* TODO: HANDLE LINE ENDING CONVENTION BETTER... */
if (stix->log.ptr[stix->log.len - 1] != '\n')
{
/* no line ending - append a line terminator */
stix->log.ptr[stix->log.len++] = '\n';
}
stix->vmprim.log_write (stix, stix->log.last_mask, stix->log.ptr, stix->log.len); stix->vmprim.log_write (stix, stix->log.last_mask, stix->log.ptr, stix->log.len);
stix->log.len = 0; stix->log.len = 0;
} }
@ -265,7 +279,7 @@ static int put_oocs (stix_t* stix, stix_oow_t mask, const stix_ooch_t* ptr, stix
if (!tmp) return -1; if (!tmp) return -1;
stix->log.ptr = tmp; stix->log.ptr = tmp;
stix->log.capa = newcapa; stix->log.capa = newcapa - 1; /* -1 to handle line ending injection more easily */
} }
STIX_MEMCPY (&stix->log.ptr[stix->log.len], ptr, len * STIX_SIZEOF(*ptr)); STIX_MEMCPY (&stix->log.ptr[stix->log.len], ptr, len * STIX_SIZEOF(*ptr));