[PATCH bpf-next 3/4] tools: bpftool: read from stdin when batch file name is "-"

[Jakub Kicinski]

From: Quentin Monnet <quentin.mon...@netronome.com>

Make bpftool read its command list from standard input when the name if
the input file is a single dash.

Signed-off-by: Quentin Monnet <quentin.mon...@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicin...@netronome.com>
---
 tools/bpf/bpftool/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index cdee4c3d30c3..1da54a9b5ea3 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -195,7 +195,10 @@ static int do_batch(int argc, char **argv)
        }
        NEXT_ARG();
 
-       fp = fopen(*argv, "r");
+       if (!strcmp(*argv, "-"))
+               fp = stdin;
+       else
+               fp = fopen(*argv, "r");
        if (!fp) {
                p_err("Can't open file (%s): %s", *argv, strerror(errno));
                return -1;
@@ -284,7 +287,8 @@ static int do_batch(int argc, char **argv)
                err = 0;
        }
 err_close:
-       fclose(fp);
+       if (fp != stdin)
+               fclose(fp);
 
        if (json_output)
                jsonw_end_array(json_wtr);
-- 
2.15.1