SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34860 from enr0n/varlinkctl-fixes

Browse Source 
Fix varlinkctl output with `--more`
This commit is contained in:
Mike Yuan
2024-10-22 23:46:33 +02:00
committed by GitHub
parent 5ff6841c23 ebc8b9e45b
commit 810d94b429
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/varlinkctl/varlinkctl.c
+6 -4
View File
@@ -194,9 +194,9 @@ static int parse_argv(int argc, char *argv[]) {
assert_not_reached();
}
/* If more than one reply is expected, imply JSON-SEQ output */
/* If more than one reply is expected, imply JSON-SEQ output, and set SD_JSON_FORMAT_FLUSH */
if (FLAGS_SET(arg_method_flags, SD_VARLINK_METHOD_MORE))
arg_json_format_flags |= SD_JSON_FORMAT_SEQ;
arg_json_format_flags |= SD_JSON_FORMAT_SEQ|SD_JSON_FORMAT_FLUSH;
strv_sort_uniq(arg_graceful);
@@ -539,8 +539,10 @@ static int verb_call(int argc, char *argv[], void *userdata) {
parameter = argc > 3 && !streq(argv[3], "-") ? argv[3] : NULL;
/* No JSON mode explicitly configured? Then default to the same as -j */
if (FLAGS_SET(arg_json_format_flags, SD_JSON_FORMAT_OFF))
arg_json_format_flags = SD_JSON_FORMAT_PRETTY_AUTO|SD_JSON_FORMAT_COLOR_AUTO;
if (FLAGS_SET(arg_json_format_flags, SD_JSON_FORMAT_OFF)) {
arg_json_format_flags &= ~SD_JSON_FORMAT_OFF;
arg_json_format_flags |= SD_JSON_FORMAT_PRETTY_AUTO|SD_JSON_FORMAT_COLOR_AUTO;
}
/* For pipeable text tools it's kinda customary to finish output off in a newline character, and not
* leave incomplete lines hanging around. */