From 06cc7fe7c2951e64cd5e73ea447791c7e6bc3852 Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Thu, 1 Mar 2018 20:20:08 -0800 Subject: [PATCH] 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: Quentin Monnet Acked-by: Jakub Kicinski Signed-off-by: Daniel Borkmann --- tools/bpf/bpftool/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index 185acfa..79587e6 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -176,6 +176,7 @@ static int do_batch(int argc, char **argv) char buf[65536]; int n_argc; FILE *fp; + char *cp; int err; int i; @@ -200,6 +201,10 @@ static int do_batch(int argc, char **argv) if (json_output) jsonw_start_array(json_wtr); while (fgets(buf, sizeof(buf), fp)) { + cp = strchr(buf, '#'); + if (cp) + *cp = '\0'; + if (strlen(buf) == sizeof(buf) - 1) { errno = E2BIG; break; -- 2.7.4