Commit 06cc7fe7 authored Mar 01, 2018 by Quentin Monnet Committed by Daniel Borkmann Mar 02, 2018

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 <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 56b112f1

tools/bpf/bpftool/main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;