navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make jq --raw-output --unbuffered work

Browse Source 
--unbuffered was only affecting the normal output case, not the --raw-output case. Make the two of them play together.

This also makes sure that the output is flushed *after* printing the newline, so a consumer doesn't lag a line behind.
This commit is contained in:
Andrew Rodland committed 2014-02-26 01:42:29 -06:00
1 parent 15faf9dc3b
commit 36e495da1e
3 files changed
+3 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jv.h
+1 -1
View File
@@ -124,7 +124,7 @@ jv jv_object_iter_value(jv, int);
int jv_get_refcnt(jv); int jv_get_refcnt(jv);
enum { JV_PRINT_PRETTY = 1, JV_PRINT_ASCII = 2, JV_PRINT_COLOUR = 4, JV_PRINT_SORTED = 8, JV_PRINT_UNBUFFERED = 16 }; enum { JV_PRINT_PRETTY = 1, JV_PRINT_ASCII = 2, JV_PRINT_COLOUR = 4, JV_PRINT_SORTED = 8 };
void jv_dumpf(jv, FILE *f, int flags); void jv_dumpf(jv, FILE *f, int flags);
void jv_dump(jv, int flags); void jv_dump(jv, int flags);
void jv_show(jv, int flags); void jv_show(jv, int flags);
jv_print.c
-3
View File
@@ -265,9 +265,6 @@ void jv_dumpf(jv x, FILE *f, int flags) {
jvp_dtoa_context_init(&C); jvp_dtoa_context_init(&C);
jv_dump_term(&C, x, flags, 0, f, 0); jv_dump_term(&C, x, flags, 0, f, 0);
jvp_dtoa_context_free(&C); jvp_dtoa_context_free(&C);
if (flags & JV_PRINT_UNBUFFERED) {
fflush(f);
}
} }
void jv_dump(jv x, int flags) { void jv_dump(jv x, int flags) {
main.c
+2 -1
View File
@@ -89,7 +89,6 @@ static int process(jq_state *jq, jv value, int flags) {
if (options & ASCII_OUTPUT) dumpopts |= JV_PRINT_ASCII; if (options & ASCII_OUTPUT) dumpopts |= JV_PRINT_ASCII;
if (options & COLOUR_OUTPUT) dumpopts |= JV_PRINT_COLOUR; if (options & COLOUR_OUTPUT) dumpopts |= JV_PRINT_COLOUR;
if (options & NO_COLOUR_OUTPUT) dumpopts &= ~JV_PRINT_COLOUR; if (options & NO_COLOUR_OUTPUT) dumpopts &= ~JV_PRINT_COLOUR;
if (options & UNBUFFERED_OUTPUT) dumpopts |= JV_PRINT_UNBUFFERED;
if (jv_get_kind(result) == JV_KIND_FALSE || jv_get_kind(result) == JV_KIND_NULL) if (jv_get_kind(result) == JV_KIND_FALSE || jv_get_kind(result) == JV_KIND_NULL)
ret = 11; ret = 11;
else else
@@ -97,6 +96,8 @@ static int process(jq_state *jq, jv value, int flags) {
jv_dump(result, dumpopts); jv_dump(result, dumpopts);
} }
printf("\n"); printf("\n");
if (options & UNBUFFERED_OUTPUT)
fflush(stdout);
} }
jv_free(result); jv_free(result);
return ret; return ret;