@port-labs/jq-node-bindings 1.0.1 → 1.0.3

package/deps/jq/src/lexer.h

@@ -462,7 +462,6 @@ void yyfree ( void * , yyscan_t yyscanner );
 #define IN_BRACE 3
 #define IN_QQINTERP 4
 #define IN_QQSTRING 5
-#define IN_COMMENT 6
 
 #endif
 
@@ -732,9 +731,9 @@ extern int yylex \
 #undef yyTABLES_NAME
 #endif
 
-#line 137 "src/lexer.l"
+#line 131 "src/lexer.l"
 
 
-#line 738 "src/lexer.h"
+#line 737 "src/lexer.h"
 #undef jq_yyIN_HEADER
 #endif /* jq_yyHEADER_H */

package/deps/jq/src/lexer.l

@@ -21,7 +21,6 @@ struct lexer_param;
 %s IN_BRACE
 %s IN_QQINTERP
 %x IN_QQSTRING
-%x IN_COMMENT
 %{
   static int enter(int opening, int state, yyscan_t yyscanner);
   static int try_exit(int closing, int state, yyscan_t yyscanner);
@@ -38,12 +37,7 @@ struct lexer_param;
 
 %%
 
-"#" { yy_push_state(IN_COMMENT, yyscanner); }
-<IN_COMMENT>{
-  \\[\\\n]|. { }
-  \n { yy_pop_state(yyscanner); }
-}
-<IN_COMMENT><<EOF>> { yy_pop_state(yyscanner); }
+"#"[^\n]* { /* comments */ }
 
 "!=" { return NEQ; }
 "==" { return EQ; }

package/deps/jq/src/libm.h

@@ -249,6 +249,11 @@ LIBM_DDD(nexttoward)
 #else
 LIBM_DDD_NO(nexttoward)
 #endif
+#if defined(HAVE_POW10) && !defined(WIN32)
+LIBM_DD(pow10)
+#else
+LIBM_DD_NO(pow10)
+#endif
 #ifdef HAVE_RINT
 LIBM_DD(rint)
 #else
@@ -284,18 +289,3 @@ LIBM_DDD(ldexp)
 #else
 LIBM_DDD_NO(ldexp)
 #endif
-#ifdef HAVE_MODF
-LIBM_DA(modf, double)
-#else
-LIBM_DA_NO(modf, double)
-#endif
-#ifdef HAVE_FREXP
-LIBM_DA(frexp, int)
-#else
-LIBM_DA_NO(frexp, int)
-#endif
-#ifdef HAVE_LGAMMA_R
-LIBM_DA(lgamma_r, int)
-#else
-LIBM_DA_NO(lgamma_r, int)
-#endif

package/deps/jq/src/linker.c

@@ -420,16 +420,14 @@ int load_program(jq_state *jq, struct locfile* src, block *out_block) {
     return 1;
   }
 
-  jv home = get_home();
-  if (jv_is_valid(home)) {
-    /* Import ~/.jq as a library named "" found in $HOME or %USERPROFILE% */
+  char* home = getenv("HOME");
+  if (home) {    // silently ignore no $HOME
+    /* Import ~/.jq as a library named "" found in $HOME */
     block import = gen_import_meta(gen_import("", NULL, 0),
         gen_const(JV_OBJECT(
             jv_string("optional"), jv_true(),
-            jv_string("search"), home)));
+            jv_string("search"), jv_string(home))));
     program = BLOCK(import, program);
-  } else {    // silently ignore if home dir not determined
-    jv_free(home);
   }
 
   nerrors = process_dependencies(jq, jq_get_jq_origin(jq), jq_get_prog_origin(jq), &program, &lib_state);

package/deps/jq/src/main.c

@@ -94,8 +94,8 @@ static void usage(int code, int keep_it_short) {
       "      --stream-errors       implies --stream and report parse error as\n"
       "                            an array;\n"
       "      --seq                 parse input/output as application/json-seq;\n"
-      "  -f, --from-file           load the filter from a file;\n"
-      "  -L, --library-path dir    search modules from the directory;\n"
+      "  -f, --from-file file      load filter from the file;\n"
+      "  -L directory              search modules from the directory;\n"
       "      --arg name value      set $name to the string value;\n"
       "      --argjson name value  set $name to the JSON value;\n"
       "      --slurpfile name file set $name to an array of JSON values read\n"
@@ -126,21 +126,23 @@ static void die() {
 }
 
 static int isoptish(const char* text) {
-  return text[0] == '-' && (text[1] == '-' || isalpha((unsigned char)text[1]));
+  return text[0] == '-' && (text[1] == '-' || isalpha(text[1]));
 }
 
-static int isoption(const char** text, char shortopt, const char* longopt, int is_short) {
-  if (is_short) {
-    if (shortopt && **text == shortopt) {
-      (*text)++;
-      if (!**text) *text = NULL;
-      return 1;
-    }
-  } else {
-    if (!strcmp(*text, longopt)) {
-      *text = NULL;
-      return 1;
-    }
+static int isoption(const char* text, char shortopt, const char* longopt, size_t *short_opts) {
+  if (text[0] != '-' || text[1] == '-')
+    *short_opts = 0;
+  if (text[0] != '-') return 0;
+
+  // check long option
+  if (text[1] == '-' && !strcmp(text+2, longopt)) return 1;
+  else if (text[1] == '-') return 0;
+
+  // must be short option; check it and...
+  if (!shortopt) return 0;
+  if (strchr(text, shortopt) != NULL) {
+    (*short_opts)++; // ...count it (for option stacking)
+    return 1;
   }
   return 0;
 }
@@ -160,8 +162,9 @@ enum {
   UNBUFFERED_OUTPUT     = 2048,
   EXIT_STATUS           = 4096,
   SEQ                   = 16384,
+  RUN_TESTS             = 32768,
   /* debugging only */
-  DUMP_DISASM           = 32768,
+  DUMP_DISASM           = 65536,
 };
 
 enum {
@@ -175,11 +178,28 @@ enum {
 #define jq_exit_with_status(r)  exit(abs(r))
 #define jq_exit(r)              exit( r > 0 ? r : 0 )
 
+#define TIMEOUT_SEC 5
+
+static const char *skip_shebang(const char *p) {
+  if (strncmp(p, "#!", sizeof("#!") - 1) != 0)
+    return p;
+  const char *n = strchr(p, '\n');
+  if (n == NULL || n[1] != '#')
+    return p;
+  n = strchr(n + 1, '\n');
+  if (n == NULL || n[1] == '#' || n[1] == '\0' || n[-1] != '\\' || n[-2] == '\\')
+    return p;
+  n = strchr(n + 1, '\n');
+  if (n == NULL)
+    return p;
+  return n+1;
+}
+
 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)
   jq_start(jq, value, flags);
   jv result;
-  while (jv_is_valid(result = jq_next(jq))) {
+  while (jv_is_valid(result = jq_next(jq, TIMEOUT_SEC))) {
     if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
       if (options & ASCII_OUTPUT) {
         jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
@@ -341,8 +361,9 @@ int main(int argc, char* argv[]) {
   int further_args_are_json = 0;
   int args_done = 0;
   int jq_flags = 0;
+  size_t short_opts = 0;
   jv lib_search_paths = jv_null();
-  for (int i=1; i<argc; i++) {
+  for (int i=1; i<argc; i++, short_opts = 0) {
     if (args_done || !isoptish(argv[i])) {
       if (!program) {
         program = argv[i];
@@ -362,171 +383,223 @@ int main(int argc, char* argv[]) {
     } else if (!strcmp(argv[i], "--")) {
       args_done = 1;
     } else {
-      const char* text = argv[i];
-      int is_short;
-      // First '-' already checked by isoptish
-      if (text[1] == '-') {
-        text += 2;
-        is_short = 0;
-      } else {
-        text++;
-        is_short = 1;
-      }
-      int raw; // Temporary for --rawfile
-
-      // Parse a long option in one iteration or iterate over short options
-      while (text != NULL) {
-        if (isoption(&text, 's', "slurp", is_short)) {
-          options |= SLURP;
-        } else if (isoption(&text, 'r', "raw-output", is_short)) {
-          options |= RAW_OUTPUT;
-        } else if (isoption(&text, 0, "raw-output0", is_short)) {
-          options |= RAW_OUTPUT | RAW_NO_LF | RAW_OUTPUT0;
-        } else if (isoption(&text, 'j', "join-output", is_short)) {
-          options |= RAW_OUTPUT | RAW_NO_LF;
-        } else if (isoption(&text, 'c', "compact-output", is_short)) {
-          dumpopts &= ~(JV_PRINT_TAB | JV_PRINT_INDENT_FLAGS(7));
-        } else if (isoption(&text, 'C', "color-output", is_short)) {
-          options |= COLOR_OUTPUT;
-        } else if (isoption(&text, 'M', "monochrome-output", is_short)) {
-          options |= NO_COLOR_OUTPUT;
-        } else if (isoption(&text, 'a', "ascii-output", is_short)) {
-          options |= ASCII_OUTPUT;
-        } else if (isoption(&text, 0, "unbuffered", is_short)) {
-          options |= UNBUFFERED_OUTPUT;
-        } else if (isoption(&text, 'S', "sort-keys", is_short)) {
-          options |= SORTED_OUTPUT;
-        } else if (isoption(&text, 'R', "raw-input", is_short)) {
-          options |= RAW_INPUT;
-        } else if (isoption(&text, 'n', "null-input", is_short)) {
-          options |= PROVIDE_NULL;
-        } else if (isoption(&text, 'f', "from-file", is_short)) {
-          options |= FROM_FILE;
-        } else if (isoption(&text, 'L', "library-path", is_short)) {
-          if (jv_get_kind(lib_search_paths) == JV_KIND_NULL)
-            lib_search_paths = jv_array();
-          if (text != NULL) { // -Lname
-            lib_search_paths = jv_array_append(lib_search_paths, jq_realpath(jv_string(text)));
-            text = NULL;
-          } else if (i >= argc - 1) {
-            fprintf(stderr, "-L takes a parameter: (e.g. -L /search/path or -L/search/path)\n");
-            die();
-          } else {
-            lib_search_paths = jv_array_append(lib_search_paths, jq_realpath(jv_string(argv[i+1])));
-            i++;
-          }
-        } else if (isoption(&text, 'b', "binary", is_short)) {
+      if (argv[i][1] == 'L') {
+        if (jv_get_kind(lib_search_paths) == JV_KIND_NULL)
+          lib_search_paths = jv_array();
+        if (argv[i][2] != 0) { // -Lname (faster check than strlen)
+            lib_search_paths = jv_array_append(lib_search_paths, jq_realpath(jv_string(argv[i]+2)));
+        } else if (i >= argc - 1) {
+          fprintf(stderr, "-L takes a parameter: (e.g. -L /search/path or -L/search/path)\n");
+          die();
+        } else {
+          lib_search_paths = jv_array_append(lib_search_paths, jq_realpath(jv_string(argv[i+1])));
+          i++;
+        }
+        continue;
+      }
+
+      if (isoption(argv[i], 's', "slurp", &short_opts)) {
+        options |= SLURP;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'r', "raw-output", &short_opts)) {
+        options |= RAW_OUTPUT;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 0, "raw-output0", &short_opts)) {
+        options |= RAW_OUTPUT | RAW_NO_LF | RAW_OUTPUT0;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'j', "join-output", &short_opts)) {
+        options |= RAW_OUTPUT | RAW_NO_LF;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'c', "compact-output", &short_opts)) {
+        dumpopts &= ~(JV_PRINT_TAB | JV_PRINT_INDENT_FLAGS(7));
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'C', "color-output", &short_opts)) {
+        options |= COLOR_OUTPUT;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'M', "monochrome-output", &short_opts)) {
+        options |= NO_COLOR_OUTPUT;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'a', "ascii-output", &short_opts)) {
+        options |= ASCII_OUTPUT;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 0, "unbuffered", &short_opts)) {
+        options |= UNBUFFERED_OUTPUT;
+        continue;
+      }
+      if (isoption(argv[i], 'S', "sort-keys", &short_opts)) {
+        options |= SORTED_OUTPUT;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'R', "raw-input", &short_opts)) {
+        options |= RAW_INPUT;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'n', "null-input", &short_opts)) {
+        options |= PROVIDE_NULL;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'f', "from-file", &short_opts)) {
+        options |= FROM_FILE;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'b', "binary", &short_opts)) {
 #ifdef WIN32
-          fflush(stdout);
-          fflush(stderr);
-          _setmode(fileno(stdin),  _O_BINARY);
-          _setmode(fileno(stdout), _O_BINARY);
-          _setmode(fileno(stderr), _O_BINARY);
+        fflush(stdout);
+        fflush(stderr);
+        _setmode(fileno(stdin),  _O_BINARY);
+        _setmode(fileno(stdout), _O_BINARY);
+        _setmode(fileno(stderr), _O_BINARY);
+        if (!short_opts) continue;
 #endif
-        } else if (isoption(&text, 0, "tab", is_short)) {
-          dumpopts &= ~JV_PRINT_INDENT_FLAGS(7);
-          dumpopts |= JV_PRINT_TAB | JV_PRINT_PRETTY;
-        } else if (isoption(&text, 0, "indent", is_short)) {
-          if (i >= argc - 1) {
-            fprintf(stderr, "%s: --indent takes one parameter\n", progname);
-            die();
-          }
-          dumpopts &= ~(JV_PRINT_TAB | JV_PRINT_INDENT_FLAGS(7));
-          int indent = atoi(argv[i+1]);
-          if (indent < -1 || indent > 7) {
-            fprintf(stderr, "%s: --indent takes a number between -1 and 7\n", progname);
-            die();
-          }
-          dumpopts |= JV_PRINT_INDENT_FLAGS(indent);
-          i++;
-        } else if (isoption(&text, 0, "seq", is_short)) {
-          options |= SEQ;
-        } else if (isoption(&text, 0, "stream", is_short)) {
-          parser_flags |= JV_PARSE_STREAMING;
-        } else if (isoption(&text, 0, "stream-errors", is_short)) {
-          parser_flags |= JV_PARSE_STREAMING | JV_PARSE_STREAM_ERRORS;
-        } else if (isoption(&text, 'e', "exit-status", is_short)) {
-          options |= EXIT_STATUS;
-        } else if (isoption(&text, 0, "args", is_short)) {
-          further_args_are_strings = 1;
-          further_args_are_json = 0;
-        } else if (isoption(&text, 0, "jsonargs", is_short)) {
-          further_args_are_strings = 0;
-          further_args_are_json = 1;
-        } else if (isoption(&text, 0, "arg", is_short)) {
-          if (i >= argc - 2) {
-            fprintf(stderr, "%s: --arg takes two parameters (e.g. --arg varname value)\n", progname);
-            die();
-          }
-          if (!jv_object_has(jv_copy(program_arguments), jv_string(argv[i+1])))
-            program_arguments = jv_object_set(program_arguments, jv_string(argv[i+1]), jv_string(argv[i+2]));
-          i += 2; // skip the next two arguments
-        } else if (isoption(&text, 0, "argjson", is_short)) {
-          if (i >= argc - 2) {
-            fprintf(stderr, "%s: --argjson takes two parameters (e.g. --argjson varname text)\n", progname);
-            die();
-          }
-          if (!jv_object_has(jv_copy(program_arguments), jv_string(argv[i+1]))) {
-            jv v = jv_parse(argv[i+2]);
-            if (!jv_is_valid(v)) {
-              fprintf(stderr, "%s: invalid JSON text passed to --argjson\n", progname);
-              die();
-            }
-            program_arguments = jv_object_set(program_arguments, jv_string(argv[i+1]), v);
-          }
-          i += 2; // skip the next two arguments
-        } else if ((raw = isoption(&text, 0, "rawfile", is_short)) ||
-            isoption(&text, 0, "slurpfile", is_short)) {
-          const char *which = raw ? "rawfile" : "slurpfile";
-          if (i >= argc - 2) {
-            fprintf(stderr, "%s: --%s takes two parameters (e.g. --%s varname filename)\n", progname, which, which);
+      }
+      if (isoption(argv[i], 0, "tab", &short_opts)) {
+        dumpopts &= ~JV_PRINT_INDENT_FLAGS(7);
+        dumpopts |= JV_PRINT_TAB | JV_PRINT_PRETTY;
+        continue;
+      }
+      if (isoption(argv[i], 0, "indent", &short_opts)) {
+        if (i >= argc - 1) {
+          fprintf(stderr, "%s: --indent takes one parameter\n", progname);
+          die();
+        }
+        dumpopts &= ~(JV_PRINT_TAB | JV_PRINT_INDENT_FLAGS(7));
+        int indent = atoi(argv[i+1]);
+        if (indent < -1 || indent > 7) {
+          fprintf(stderr, "%s: --indent takes a number between -1 and 7\n", progname);
+          die();
+        }
+        dumpopts |= JV_PRINT_INDENT_FLAGS(indent);
+        i++;
+        continue;
+      }
+      if (isoption(argv[i], 0, "seq", &short_opts)) {
+        options |= SEQ;
+        continue;
+      }
+      if (isoption(argv[i], 0, "stream", &short_opts)) {
+        parser_flags |= JV_PARSE_STREAMING;
+        continue;
+      }
+      if (isoption(argv[i], 0, "stream-errors", &short_opts)) {
+        parser_flags |= JV_PARSE_STREAMING | JV_PARSE_STREAM_ERRORS;
+        continue;
+      }
+      if (isoption(argv[i], 'e', "exit-status", &short_opts)) {
+        options |= EXIT_STATUS;
+        if (!short_opts) continue;
+      }
+      // FIXME: For --arg* we should check that the varname is acceptable
+      if (isoption(argv[i], 0, "args", &short_opts)) {
+        further_args_are_strings = 1;
+        further_args_are_json = 0;
+        continue;
+      }
+      if (isoption(argv[i], 0, "jsonargs", &short_opts)) {
+        further_args_are_strings = 0;
+        further_args_are_json = 1;
+        continue;
+      }
+      if (isoption(argv[i], 0, "arg", &short_opts)) {
+        if (i >= argc - 2) {
+          fprintf(stderr, "%s: --arg takes two parameters (e.g. --arg varname value)\n", progname);
+          die();
+        }
+        if (!jv_object_has(jv_copy(program_arguments), jv_string(argv[i+1])))
+          program_arguments = jv_object_set(program_arguments, jv_string(argv[i+1]), jv_string(argv[i+2]));
+        i += 2; // skip the next two arguments
+        continue;
+      }
+      if (isoption(argv[i], 0, "argjson", &short_opts)) {
+        if (i >= argc - 2) {
+          fprintf(stderr, "%s: --argjson takes two parameters (e.g. --argjson varname text)\n", progname);
+          die();
+        }
+        if (!jv_object_has(jv_copy(program_arguments), jv_string(argv[i+1]))) {
+          jv v = jv_parse(argv[i+2]);
+          if (!jv_is_valid(v)) {
+            fprintf(stderr, "%s: invalid JSON text passed to --argjson\n", progname);
             die();
           }
-          if (!jv_object_has(jv_copy(program_arguments), jv_string(argv[i+1]))) {
-            jv data = jv_load_file(argv[i+2], raw);
-            if (!jv_is_valid(data)) {
-              data = jv_invalid_get_msg(data);
-              fprintf(stderr, "%s: Bad JSON in --%s %s %s: %s\n", progname, which,
-                      argv[i+1], argv[i+2], jv_string_value(data));
-              jv_free(data);
-              ret = JQ_ERROR_SYSTEM;
-              goto out;
-            }
-            program_arguments = jv_object_set(program_arguments, jv_string(argv[i+1]), data);
-          }
-          i += 2; // skip the next two arguments
-        } else if (isoption(&text,  0,  "debug-dump-disasm", is_short)) {
-          options |= DUMP_DISASM;
-        } else if (isoption(&text,  0,  "debug-trace=all", is_short)) {
-          jq_flags |= JQ_DEBUG_TRACE_ALL;
-        } else if (isoption(&text,  0,  "debug-trace", is_short)) {
-          jq_flags |= JQ_DEBUG_TRACE;
-        } else if (isoption(&text, 'h', "help", is_short)) {
-          usage(0, 0);
-        } else if (isoption(&text, 'V', "version", is_short)) {
-          printf("jq-%s\n", JQ_VERSION);
-          ret = JQ_OK;
-          goto out;
-        } else if (isoption(&text, 0, "build-configuration", is_short)) {
-          printf("%s\n", JQ_CONFIG);
-          ret = JQ_OK;
-          goto out;
-        } else if (isoption(&text, 0, "run-tests", is_short)) {
-          i++;
-          // XXX Pass program_arguments, even a whole jq_state *, through;
-          // could be useful for testing
-          ret = jq_testsuite(lib_search_paths,
-                             (options & DUMP_DISASM) || (jq_flags & JQ_DEBUG_TRACE),
-                             argc - i, argv + i);
-          goto out;
-        } else {
-          if (is_short) {
-            fprintf(stderr, "%s: Unknown option -%c\n", progname, text[0]);
-          } else {
-            fprintf(stderr, "%s: Unknown option --%s\n", progname, text);
-          }
+          program_arguments = jv_object_set(program_arguments, jv_string(argv[i+1]), v);
+        }
+        i += 2; // skip the next two arguments
+        continue;
+      }
+      if (isoption(argv[i], 0, "rawfile", &short_opts) ||
+          isoption(argv[i], 0, "slurpfile", &short_opts)) {
+        int raw = isoption(argv[i], 0, "rawfile", &short_opts);
+        const char *which;
+        if (raw)
+          which = "rawfile";
+        else
+          which = "slurpfile";
+        if (i >= argc - 2) {
+          fprintf(stderr, "%s: --%s takes two parameters (e.g. --%s varname filename)\n", progname, which, which);
           die();
         }
+        if (!jv_object_has(jv_copy(program_arguments), jv_string(argv[i+1]))) {
+          jv data = jv_load_file(argv[i+2], raw);
+          if (!jv_is_valid(data)) {
+            data = jv_invalid_get_msg(data);
+            fprintf(stderr, "%s: Bad JSON in --%s %s %s: %s\n", progname, which,
+                    argv[i+1], argv[i+2], jv_string_value(data));
+            jv_free(data);
+            ret = JQ_ERROR_SYSTEM;
+            goto out;
+          }
+          program_arguments = jv_object_set(program_arguments, jv_string(argv[i+1]), data);
+        }
+        i += 2; // skip the next two arguments
+        continue;
+      }
+      if (isoption(argv[i],  0,  "debug-dump-disasm", &short_opts)) {
+        options |= DUMP_DISASM;
+        continue;
+      }
+      if (isoption(argv[i],  0,  "debug-trace=all", &short_opts)) {
+        jq_flags |= JQ_DEBUG_TRACE_ALL;
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i],  0,  "debug-trace", &short_opts)) {
+        jq_flags |= JQ_DEBUG_TRACE;
+        continue;
+      }
+      if (isoption(argv[i], 'h', "help", &short_opts)) {
+        usage(0, 0);
+        if (!short_opts) continue;
+      }
+      if (isoption(argv[i], 'V', "version", &short_opts)) {
+        printf("jq-%s\n", JQ_VERSION);
+        ret = JQ_OK;
+        goto out;
+      }
+      if (isoption(argv[i], 0, "build-configuration", &short_opts)) {
+        printf("%s\n", JQ_CONFIG);
+        ret = JQ_OK;
+        goto out;
+      }
+      if (isoption(argv[i], 0, "run-tests", &short_opts)) {
+        i++;
+        // XXX Pass program_arguments, even a whole jq_state *, through;
+        // could be useful for testing
+        ret = jq_testsuite(lib_search_paths,
+                           (options & DUMP_DISASM) || (jq_flags & JQ_DEBUG_TRACE),
+                           argc - i, argv + i);
+        goto out;
+      }
+
+      // check for unknown options... if this argument was a short option
+      if (strlen(argv[i]) != short_opts + 1) {
+        fprintf(stderr, "%s: Unknown option %s\n", progname, argv[i]);
+        die();
       }
     }
   }
@@ -585,7 +658,7 @@ int main(int argc, char* argv[]) {
     jq_set_attr(jq, jv_string("VERSION_DIR"), jv_string_fmt("%.*s-master", (int)(strchr(JQ_VERSION, '-') - JQ_VERSION), JQ_VERSION));
 
 #ifdef USE_ISATTY
-  if (!program && !(options & FROM_FILE) && (!isatty(STDOUT_FILENO) || !isatty(STDIN_FILENO)))
+  if (!program && (!isatty(STDOUT_FILENO) || !isatty(STDIN_FILENO)))
     program = ".";
 #endif
 
@@ -614,7 +687,7 @@ int main(int argc, char* argv[]) {
       program_arguments = jv_object_set(program_arguments,
                                         jv_string("JQ_BUILD_CONFIGURATION"),
                                         jv_string(JQ_CONFIG)); /* named arguments */
-    compiled = jq_compile_args(jq, jv_string_value(data), jv_copy(program_arguments));
+    compiled = jq_compile_args(jq, skip_shebang(jv_string_value(data)), jv_copy(program_arguments));
     free(program_origin);
     jv_free(data);
   } else {