parser_json: use stdin buffer if available
Pablo Neira Ayuso
maintainerPATCH 1/2 parser_json: use stdin buffer if available
Since 5c2b2b0a2ba7 ("src: error reporting with -f and read from stdin") stdin is stored in a buffer, update json support to use it instead of reading from /dev/stdin.
Some systems do not provide /dev/stdin symlink to /proc/self/fd/0 according to reporter (that mentions Yocto Linux as example).
---
v2: remove check for nft_output_json() in nft_run_cmd_from_filename()
as suggested by Phil Sutter, so JSON support does not really use /dev/stdin.
src/libnftables.c | 3 +-- src/parser_json.c | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
src/libnftables.c +1 -2
@@ -807,8 +807,7 @@ int nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filename)if (!strcmp (filename,"-" )) filename ="/dev/stdin" ; -if (!strcmp (filename,"/dev/stdin" ) && - !nft_output_json (&nft->output)) +if (!strcmp (filename,"/dev/stdin" )) nft->stdin_buf =stdin_to_buffer (); if (!nft->stdin_buf &&
src/parser_json.c +7 -0
@@ -4357,6 +4357,13 @@ int nft_parse_json_filename(struct nft_ctx *nft, const char *filename,json_error_t err;int ret; +if (nft->stdin_buf) { + json_indesc.type =INDESC_STDIN ; + json_indesc.name ="/dev/stdin" ; + +return nft_parse_json_buffer (nft, nft->stdin_buf, msgs, cmds); + } + json_indesc.type =INDESC_FILE ; json_indesc.name = filename;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 libnftables: skip useable checks for /dev/stdin
/dev/stdin is a placeholder, read() from STDIN_FILENO is used to fetch the standard input into a buffer.
Since 5c2b2b0a2ba7 ("src: error reporting with -f and read from stdin") stdin is stored in a buffer to fix error reporting.
This patch requires: ("parser_json: use stdin buffer if available")
---
v2: no changes.
src/libnftables.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
src/libnftables.c +4 -3
@@ -664,6 +664,7 @@ retry:/* need to use stat() to, fopen() will block for named fifos and * libjansson makes no checks before or after open either. +* /dev/stdin is *never* used, read() from STDIN_FILENO is used instead. */ static struct error_record *filename_is_useable (struct nft_ctx *nft,const char *name) {
@@ -671,6 +672,9 @@ static struct error_record *filename_is_useable(struct nft_ctx *nft, const charstruct stat sb;int err; +if (!strcmp (name,"/dev/stdin" )) +return NULL ; + err =stat (name, &sb);if (err) return error(&internal_location, "Could not open file \"%s\": %s\n",
@@ -681,9 +685,6 @@ static struct error_record *filename_is_useable(struct nft_ctx *nft, const charif (type ==S_IFREG || type ==S_IFIFO )return NULL ; -if (type ==S_IFCHR &&0 ==strcmp (name,"/dev/stdin" )) -return NULL ; -return error (&internal_location,"Not a regular file: \"%s\"\n" , name); }
Signature · 1 line
2.30.2
Quoted 7 lines · Pablo Neira Ayuso
Since
5c2b2b0a2ba7("src: error reporting with -f and read from stdin") stdin is stored in a buffer, update json support to use it instead of reading from/dev/stdin.Some systems do not provide
/dev/stdinsymlink to/proc/self/fd/0according to reporter (that mentions Yocto Linux as example).
Quoted 6 lines
Fixes 935f82e7dd49 ("Support 'nft -f -' to read from stdin")Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: remove check fornft_output_json()innft_run_cmd_from_filename()
as suggested by Phil Sutter, so JSON support does not really use/dev/stdin.
Series:
Thanks, Phil
Pablo Neira Ayuso
maintainerQuoted 15 lines · Phil Sutter
Quoted 7 lines · Pablo Neira Ayuso
Since
5c2b2b0a2ba7("src: error reporting with -f and read from stdin") stdin is stored in a buffer, update json support to use it instead of reading from/dev/stdin.Some systems do not provide
/dev/stdinsymlink to/proc/self/fd/0according to reporter (that mentions Yocto Linux as example).Quoted 6 lines
Fixes 935f82e7dd49 ("Support 'nft -f -' to read from stdin")Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: remove check fornft_output_json()innft_run_cmd_from_filename()
as suggested by Phil Sutter, so JSON support does not really use/dev/stdin.
Quoted 2 lines
Series:
Acked-by Phil Sutter <[email protected]>
Pushed out, thanks