merging upstream stedolan changes

main.c

@@ -1,7 +1,9 @@
+#define _POSIX_SOURCE
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
+#include <unistd.h>
 #include "compile.h"
 #include "builtin.h"
 #include "jv.h"
@@ -10,15 +12,17 @@
 #include "parser.h"
 #include "execute.h"
 #include "config.h"  /* Autoconf generated header file */
+#include "jv_alloc.h"
 
 static const char* progname;
 
 static void usage() {
   fprintf(stderr, "\njq - commandline JSON processor [version %s]\n", PACKAGE_VERSION);
-  fprintf(stderr, "Usage: %s [options] <jq filter>\n\n", progname);
+  fprintf(stderr, "Usage: %s [options] <jq filter> [file...]\n\n", progname);
   fprintf(stderr, "For a description of the command line options and\n");
   fprintf(stderr, "how to write jq filters (and why you might want to)\n");
-  fprintf(stderr, "see the jq documentation at http://stedolan.github.com/jq\n\n");
+  fprintf(stderr, "see the jq manpage, or the online documentation at\n");
+  fprintf(stderr, "http://stedolan.github.com/jq\n\n");
   exit(1);
 }
 
@@ -50,8 +54,10 @@ enum {
   RAW_OUTPUT = 8,
   COMPACT_OUTPUT = 16,
   ASCII_OUTPUT = 32,
+  COLOUR_OUTPUT = 64,
+  NO_COLOUR_OUTPUT = 128,
 
-  FROM_FILE = 64,
+  FROM_FILE = 256,
 };
 static int options = 0;
 static struct bytecode* bc;
@@ -62,10 +68,18 @@ static void process(jv value) {
   while (jv_is_valid(result = jq_next())) {
     if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
       fwrite(jv_string_value(result), 1, jv_string_length(jv_copy(result)), stdout);
+      jv_free(result);
     } else {
-      int dumpopts = 0;
+      int dumpopts;
+#ifdef JQ_DEFAULT_ENABLE_COLOR
+      dumpopts = JQ_DEFAULT_ENABLE_COLOR ? JV_PRINT_COLOUR : 0;
+#else
+      dumpopts = isatty(fileno(stdout)) ? JV_PRINT_COLOUR : 0;
+#endif
       if (!(options & COMPACT_OUTPUT)) dumpopts |= JV_PRINT_PRETTY;
       if (options & ASCII_OUTPUT) dumpopts |= JV_PRINT_ASCII;
+      if (options & COLOUR_OUTPUT) dumpopts |= JV_PRINT_COLOUR;
+      if (options & NO_COLOUR_OUTPUT) dumpopts &= ~JV_PRINT_COLOUR;
       jv_dump(result, dumpopts);
     }
     printf("\n");
@@ -97,20 +111,63 @@ static jv slurp_file(const char* filename) {
   return data;
 }
 
+FILE* current_input;
+const char** input_filenames;
+int ninput_files;
+int next_input_idx;
+static int read_more(char* buf, size_t size) {
+  while (!current_input || feof(current_input)) {
+    if (current_input) {
+      fclose(current_input);
+      current_input = 0;
+    }
+    if (next_input_idx == ninput_files) {
+      return 0;
+    }
+    if (!strcmp(input_filenames[next_input_idx], "-")) {
+      current_input = stdin;
+    } else {
+      current_input = fopen(input_filenames[next_input_idx], "r");
+    }
+    if (!current_input) {
+      fprintf(stderr, "%s: %s: %s\n", progname, input_filenames[next_input_idx], strerror(errno));
+    }
+    next_input_idx++;
+  }
+
+  if (!fgets(buf, size, current_input)) buf[0] = 0;
+  return 1;
+}
+
 int main(int argc, char* argv[]) {
   if (argc) progname = argv[0];
 
   const char* program = 0;
+  input_filenames = jv_mem_alloc(sizeof(const char*) * argc);
+  ninput_files = 0;
+  int further_args_are_files = 0;
   for (int i=1; i<argc; i++) {
-    if (!isoptish(argv[i])) {
-      if (program) usage();
-      program = argv[i];
+    if (further_args_are_files) {
+      input_filenames[ninput_files++] = argv[i];
+    } else if (!strcmp(argv[i], "--")) {
+      if (!program) usage();
+      further_args_are_files = 1;
+    } else if (!isoptish(argv[i])) {
+      if (program) {
+        input_filenames[ninput_files++] = argv[i];
+      } else {
+        program = argv[i];
+      }
     } else if (isoption(argv[i], 's', "slurp")) {
       options |= SLURP;
     } else if (isoption(argv[i], 'r', "raw-output")) {
       options |= RAW_OUTPUT;
     } else if (isoption(argv[i], 'c', "compact-output")) {
       options |= COMPACT_OUTPUT;
+    } else if (isoption(argv[i], 'C', "color-output")) {
+      options |= COLOUR_OUTPUT;
+    } else if (isoption(argv[i], 'M', "monochrome-output")) {
+      options |= NO_COLOUR_OUTPUT;
     } else if (isoption(argv[i], 'a', "ascii-output")) {
       options |= ASCII_OUTPUT;
     } else if (isoption(argv[i], 'R', "raw-input")) {
@@ -130,6 +187,7 @@ int main(int argc, char* argv[]) {
     }
   }
   if (!program) usage();
+  if (ninput_files == 0) current_input = stdin;
 
   if ((options & PROVIDE_NULL) && (options & (RAW_INPUT | SLURP))) {
     fprintf(stderr, "%s: --null-input cannot be used with --raw-input or --slurp\n", progname);
@@ -169,9 +227,8 @@ int main(int argc, char* argv[]) {
     }
     struct jv_parser parser;
     jv_parser_init(&parser);
-    while (!feof(stdin)) {
-      char buf[4096];
-      if (!fgets(buf, sizeof(buf), stdin)) buf[0] = 0;
+    char buf[4096];
+    while (read_more(buf, sizeof(buf))) {
       if (options & RAW_INPUT) {
         int len = strlen(buf);
         if (len > 0) {
@@ -207,7 +264,7 @@ int main(int argc, char* argv[]) {
       process(slurped);
     }
   }
-
+  jv_mem_free(input_filenames);
   bytecode_free(bc);
   return 0;
 }