tools: bpftool: json: fix backslash escape typo in jsonw_puts
PATCH 1/1 tools: bpftool: json: fix backslash escape typo in jsonw_puts
This is essentially a backport of iproute2's
commit ed54f76484b5 ("json: fix backslash escape typo in jsonw_puts")
Also added the stdio.h include in json_writer.h to be able to compile and run the json_writer test as used below).
Before this fix:
$ gcc -D notused -D TEST -I../../include -o json_writer json_writer.c
json_writer.h
$ ./json_writer
{
"Vyatta": {
"url": "http://vyatta.com",
"downloads": 2000000,
"stock": 8.16,
"ARGV": [],
"empty": [],
"NIL": {},
"my_null": null,
"special chars": [
"slash": "/",
"newline": "\n",
"tab": "\t",
"ff": "\f",
"quote": "\"",
"tick": "'",
"backslash": "\n"
]
}
}After:
$ gcc -D notused -D TEST -I../../include -o json_writer json_writer.c
json_writer.h
$ ./json_writer
{
"Vyatta": {
"url": "http://vyatta.com",
"downloads": 2000000,
"stock": 8.16,
"ARGV": [],
"empty": [],
"NIL": {},
"my_null": null,
"special chars": [
"slash": "/",
"newline": "\n",
"tab": "\t",
"ff": "\f",
"quote": "\"",
"tick": "'",
"backslash": "\\"
]
}
}--- tools/bpf/bpftool/json_writer.c | 2 +- tools/bpf/bpftool/json_writer.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
tools/bpf/bpftool/json_writer.c +1 -1
@@ -75,7 +75,7 @@ static void jsonw_puts(json_writer_t *self, const char *str)fputs ("\\b" , self->out);break ;case '\\' : -fputs ("\\n" , self->out); +fputs ("\\\\" , self->out);break ;case '"' :fputs ("\\\"" , self->out);
tools/bpf/bpftool/json_writer.h +1 -0
@@ -14,6 +14,7 @@#include <stdbool.h> #include <stdint.h> #include <stdarg.h> +#include <stdio.h> #include <linux/compiler.h> /* Opaque class structure */
Signature · 1 line
2.34.1
2023-03-29 00:30 UTC-0700 ~ Manu Bretelle <[email protected]>
Quoted 58 lines
This is essentially a backport of iproute2's
commited54f76484b5("json: fix backslash escape typo injsonw_puts")Also added the
stdio.hinclude injson_writer.hto be able to compile and run thejson_writertest as used below).Before this fix:
$ gcc -D notused -D TEST -I../../include -o json_writer json_writer.c json_writer.h $ ./json_writer { "Vyatta": { "url": "http://vyatta.com", "downloads": 2000000, "stock": 8.16, "ARGV": [], "empty": [], "NIL": {}, "my_null": null, "special chars": [ "slash": "/", "newline": "\n", "tab": "\t", "ff": "\f", "quote": "\"", "tick": "'", "backslash": "\n" ] } }After:
$ gcc -D notused -D TEST -I../../include -o json_writer json_writer.c json_writer.h $ ./json_writer { "Vyatta": { "url": "http://vyatta.com", "downloads": 2000000, "stock": 8.16, "ARGV": [], "empty": [], "NIL": {}, "my_null": null, "special chars": [ "slash": "/", "newline": "\n", "tab": "\t", "ff": "\f", "quote": "\"", "tick": "'", "backslash": "\\" ] } }
Quoted 1 line
Signed-off-by Manu Bretelle <[email protected]>
Thank you!
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Wed, 29 Mar 2023 00:30:02 -0700 you wrote:
This is essentially a backport of iproute2's
commited54f76484b5("json: fix backslash escape typo injsonw_puts")Also added the
stdio.hinclude injson_writer.hto be able to compile and run thejson_writertest as used below).Before this fix:
[...]
Here is the summary with links:
- tools: bpftool: json: fix backslash escape typo in jsonw_puts
https://git.kernel.org/bpf/bpf-next/c/d8d8b008629f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html