Commit 06cc7fe7 authored by Quentin Monnet's avatar Quentin Monnet Committed by Daniel Borkmann

tools: bpftool: support comments in batch files

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: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 56b112f1
...@@ -176,6 +176,7 @@ static int do_batch(int argc, char **argv) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment