matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utils: add print_escape_buf to format and print arbitrary bytes 

Keep it as simple as possible for now: just escape anything that is not
isprint-able, is among the "escape" parameter or '\' as an octal escape
sequence. This should be pretty easy to extend if any other user needs
something more complex in the future.

Signed-off-by: Ivan Delalande <colona@arista.com>
This commit is contained in:
Ivan Delalande 2017-10-06 16:48:19 -07:00 committed by Stephen Hemminger
parent 4f6b73380d
commit 7c72df5a95
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils.h
View File

@ -195,6 +195,8 @@ static inline void __jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
tv->tv_usec = tvusec - 1000000 * tv->tv_sec;
}
void print_escape_buf(const __u8 *buf, size_t len, const char *escape);
int print_timestamp(FILE *fp);
void print_nlmsg_timestamp(FILE *fp, const struct nlmsghdr *n);

15
lib/utils.c
View File

@ -31,6 +31,7 @@
#include <time.h>
#include <sys/time.h>
#include <errno.h>
#include <ctype.h>
#include "rt_names.h"
#include "utils.h"
@ -1047,6 +1048,20 @@ int addr64_n2a(__u64 addr, char *buff, size_t len)
return written;
}
/* Print buffer and escape bytes that are !isprint or among 'escape' */
void print_escape_buf(const __u8 *buf, size_t len, const char *escape)
{
size_t i;
for (i = 0; i < len; ++i) {
if (isprint(buf[i]) && buf[i] != '\\' &&
!strchr(escape, buf[i]))
printf("%c", buf[i]);
else
printf("\\%03o", buf[i]);
}
}
int print_timestamp(FILE *fp)
{
struct timeval tv;