Add flag to disable colors in output

Author: t-nelson

src/main.c

@@ -208,6 +208,7 @@ void fill_output()
 static const struct option  longopts[]  =
 {
     { "help",     no_argument,        NULL, 'h' }
+  , { "nocolor",  no_argument,        NULL, 'n' }
   , { "reverse",  no_argument,        NULL, 'r' }
   , { "sort",     required_argument,  NULL, 's' }
   , {}
@@ -246,6 +247,7 @@ static void print_help(const char* argv0)
   printf(
       "Mandatory arguments to long options are also mandatory for short options.\n"
       " -h  --help        Display this help message.\n"
+      " -n  --nocolor     Do not display color codes.\n"
       " -r  --reverse     Reverse sort order.\n"
       " -s  --sort=<ARG>  Sort output by ARG. Accepted values for ARG are: \n");
   printf(
@@ -263,13 +265,16 @@ int main(int argc, char* argv[])
   int         sort_dir  = 1;
   int         opt;
 
-  while (-1 != (opt = getopt_long(argc, argv, "hrs:", longopts, NULL)))
+  while (-1 != (opt = getopt_long(argc, argv, "hnrs:", longopts, NULL)))
   {
     switch (opt)
     {
       case 'r':
         sort_dir = -1;
         break;
+      case 'n':
+        output_fmt_enable_colors(false);
+        break;
       case 's':
       {
         enum FIELD f;

src/output_fmt.c

@@ -31,18 +31,42 @@ enum COLOR
   , _COLOR_MAX
 };
 
-static const char*  colors[_COLOR_MAX] =
+enum COLORSET
 {
-    [COLOR_RED]     = "\x1B[31m"
-  , [COLOR_GREEN]   = "\x1B[32m"
-  , [COLOR_YELLOW]  = "\x1B[33m"
-  , [COLOR_BLUE]    = "\x1B[34m"
-  , [COLOR_MAGENTA] = "\x1B[35m"
-  , [COLOR_CYAN]    = "\x1B[36m"
-  , [COLOR_BOLD]    = "\x1B[1m"
-  , [COLOR_NONE]    = "\x1B[0m"
+    _COLORSET_FIRST   = 0
+  , COLORSET_DEFAULT  = _COLORSET_FIRST
+  , COLORSET_NONE
+  , _COLORSET_MAX
 };
 
+static const char*  colorset[_COLORSET_MAX][_COLOR_MAX] =
+{
+    [COLORSET_NONE] =
+    {
+        [COLOR_RED]     = ""
+      , [COLOR_GREEN]   = ""
+      , [COLOR_YELLOW]  = ""
+      , [COLOR_BLUE]    = ""
+      , [COLOR_MAGENTA] = ""
+      , [COLOR_CYAN]    = ""
+      , [COLOR_BOLD]    = ""
+      , [COLOR_NONE]    = ""
+    }
+  , [COLORSET_DEFAULT] =
+    {
+        [COLOR_RED]     = "\x1B[31m"
+      , [COLOR_GREEN]   = "\x1B[32m"
+      , [COLOR_YELLOW]  = "\x1B[33m"
+      , [COLOR_BLUE]    = "\x1B[34m"
+      , [COLOR_MAGENTA] = "\x1B[35m"
+      , [COLOR_CYAN]    = "\x1B[36m"
+      , [COLOR_BOLD]    = "\x1B[1m"
+      , [COLOR_NONE]    = "\x1B[0m"
+    }
+};
+
+static const char** colors  = colorset[COLORSET_DEFAULT];
+
 struct field
 {
   char*       string;
@@ -628,3 +652,12 @@ output_fmt_add_dev(
   return rc;
 }
 
+void
+output_fmt_enable_colors(
+  bool enable
+)
+{
+  enum COLORSET cs  = enable ? COLORSET_DEFAULT : COLORSET_NONE;
+  colors = colorset[cs];
+}
+

src/output_fmt.h

@@ -46,5 +46,9 @@ void
 output_fmt_deinit(
 );
 
+void
+output_fmt_enable_colors(
+  bool enable
+);
 #endif /* OUTPUT_FMT_H__ */