tools: bpftool: read from stdin when batch file name is "-"
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.monnet@netronome.com> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Родитель
65d538dde6
Коммит
416656bbaa
|
@ -195,7 +195,10 @@ static int do_batch(int argc, char **argv)
|
||||||
}
|
}
|
||||||
NEXT_ARG();
|
NEXT_ARG();
|
||||||
|
|
||||||
fp = fopen(*argv, "r");
|
if (!strcmp(*argv, "-"))
|
||||||
|
fp = stdin;
|
||||||
|
else
|
||||||
|
fp = fopen(*argv, "r");
|
||||||
if (!fp) {
|
if (!fp) {
|
||||||
p_err("Can't open file (%s): %s", *argv, strerror(errno));
|
p_err("Can't open file (%s): %s", *argv, strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -284,7 +287,8 @@ static int do_batch(int argc, char **argv)
|
||||||
err = 0;
|
err = 0;
|
||||||
}
|
}
|
||||||
err_close:
|
err_close:
|
||||||
fclose(fp);
|
if (fp != stdin)
|
||||||
|
fclose(fp);
|
||||||
|
|
||||||
if (json_output)
|
if (json_output)
|
||||||
jsonw_end_array(json_wtr);
|
jsonw_end_array(json_wtr);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче