leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: bpftool: support comments in batch files

Browse Source 
Replace '#' by '\0' in commands read from batch files in order to avoid
processing the remaining part of the line, thus allowing users to use
comments in the files.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Quentin Monnet 2018-03-01 20:20:08 -08:00 committed by Daniel Borkmann
parent 56b112f17e
commit 06cc7fe7c2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/bpf/bpftool/main.c
View File

@ -176,6 +176,7 @@ static int do_batch(int argc, char **argv)
char buf[65536]; char buf[65536];
int n_argc; int n_argc;
FILE *fp; FILE *fp;
char *cp;
int err; int err;
int i; int i;
@ -200,6 +201,10 @@ static int do_batch(int argc, char **argv)
if (json_output) if (json_output)
jsonw_start_array(json_wtr); jsonw_start_array(json_wtr);
while (fgets(buf, sizeof(buf), fp)) { while (fgets(buf, sizeof(buf), fp)) {
cp = strchr(buf, '#');
if (cp)
*cp = '\0';
if (strlen(buf) == sizeof(buf) - 1) { if (strlen(buf) == sizeof(buf) - 1) {
errno = E2BIG; errno = E2BIG;
break; break;