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

Move options to main and pass it to process

Browse Source
This commit is contained in:
Robert Aboukhalil authored and Nico Williams committed 2023-07-19 13:07:46 -05:00
1 parent 4c25cf3f7c
commit a192e647c5
1 file changed
+4 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+4 -10
View File
@@ -146,7 +146,6 @@ enum {
/* debugging only */ /* debugging only */
DUMP_DISASM = 65536, DUMP_DISASM = 65536,
}; };
static int options = 0;
enum { enum {
JQ_OK = 0, JQ_OK = 0,
@@ -174,7 +173,7 @@ static const char *skip_shebang(const char *p) {
return n+1; return n+1;
} }
static int process(jq_state *jq, jv value, int flags, int dumpopts) { static int process(jq_state *jq, jv value, int flags, int dumpopts, int options) {
int ret = JQ_OK_NO_OUTPUT; // No valid results && -e -> exit(4) int ret = JQ_OK_NO_OUTPUT; // No valid results && -e -> exit(4)
jq_start(jq, value, flags); jq_start(jq, value, flags);
jv result; jv result;
@@ -281,6 +280,7 @@ int main(int argc, char* argv[]) {
int nfiles = 0; int nfiles = 0;
int last_result = -1; /* -1 = no result, 0=null or false, 1=true */ int last_result = -1; /* -1 = no result, 0=null or false, 1=true */
int badwrite; int badwrite;
int options = 0;
jv ARGS = jv_array(); /* positional arguments */ jv ARGS = jv_array(); /* positional arguments */
jv program_arguments = jv_object(); /* named arguments */ jv program_arguments = jv_object(); /* named arguments */
@@ -292,12 +292,6 @@ int main(int argc, char* argv[]) {
_setmode(fileno(stderr), _O_TEXT | _O_U8TEXT); _setmode(fileno(stderr), _O_TEXT | _O_U8TEXT);
#endif #endif
#ifdef __EMSCRIPTEN__
/* When compiling to WebAssembly with Emscripten, reset options to ensure we can
call main() multiple times without reinitializing the WebAssembly module. */
options = 0;
#endif
if (argc) progname = argv[0]; if (argc) progname = argv[0];
jq = jq_init(); jq = jq_init();
@@ -694,13 +688,13 @@ int main(int argc, char* argv[]) {
jq_util_input_add_input(input_state, "-"); jq_util_input_add_input(input_state, "-");
if (options & PROVIDE_NULL) { if (options & PROVIDE_NULL) {
ret = process(jq, jv_null(), jq_flags, dumpopts); ret = process(jq, jv_null(), jq_flags, dumpopts, options);
} else { } else {
jv value; jv value;
while (jq_util_input_errors(input_state) == 0 && while (jq_util_input_errors(input_state) == 0 &&
(jv_is_valid((value = jq_util_input_next_input(input_state))) || jv_invalid_has_msg(jv_copy(value)))) { (jv_is_valid((value = jq_util_input_next_input(input_state))) || jv_invalid_has_msg(jv_copy(value)))) {
if (jv_is_valid(value)) { if (jv_is_valid(value)) {
ret = process(jq, value, jq_flags, dumpopts); ret = process(jq, value, jq_flags, dumpopts, options);
if (ret <= 0 && ret != JQ_OK_NO_OUTPUT) if (ret <= 0 && ret != JQ_OK_NO_OUTPUT)
last_result = (ret != JQ_OK_NULL_KIND); last_result = (ret != JQ_OK_NULL_KIND);
if (jq_halted(jq)) if (jq_halted(jq))