mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tools: add append_prefixed_str()

Browse Source 
This is somewhat related to indent_msg() except that this one places a
known prefix at the beginning of each line, allows to replace the EOL
character, and not to insert a prefix on the first line if not desired.
It works with a normal output buffer/chunk so it doesn't need to allocate
anything nor to modify the input string. It is suitable for use in multi-
line backtraces.
This commit is contained in:
Willy Tarreau 2019-08-21 13:17:37 +02:00
parent a512b02f67
commit a2c9911ace
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/standard.h
View File

@ -1238,6 +1238,7 @@ char *memprintf(char **out, const char *format, ...)
* free(err);
*/
char *indent_msg(char **out, int level);
int append_prefixed_str(struct buffer *out, const char *in, const char *pfx, char eol, int first);
/* removes environment variable <name> from the environment as found in
* environ. This is only provided as an alternative for systems without

35
src/standard.c
View File

@ -3709,6 +3709,41 @@ char *indent_msg(char **out, int level)
return ret;
}
/* makes a copy of message <in> into <out>, with each line prefixed with <pfx>
* and end of lines replaced with <eol> if not 0. The first line to indent has
* to be indicated in <first> (starts at zero), so that it is possible to skip
* indenting the first line if it has to be appended after an existing message.
* Empty strings are never indented, and NULL strings are considered empty both
* for <in> and <pfx>. It returns non-zero if an EOL was appended as the last
* character, non-zero otherwise.
*/
int append_prefixed_str(struct buffer *out, const char *in, const char *pfx, char eol, int first)
{
int bol, lf;
int pfxlen = pfx ? strlen(pfx) : 0;
if (!in)
return 0;
bol = 1;
lf = 0;
while (*in) {
if (bol && pfxlen) {
if (first > 0)
first--;
else
b_putblk(out, pfx, pfxlen);
bol = 0;
}
lf = (*in == '\n');
bol |= lf;
b_putchr(out, (lf && eol) ? eol : *in);
in++;
}
return lf;
}
/* removes environment variable <name> from the environment as found in
* environ. This is only provided as an alternative for systems without
* unsetenv() (old Solaris and AIX versions). THIS IS NOT THREAD SAFE.