Include debian/ directory

[colorize.git] / colorize.c

diff --git a/colorize.c b/colorize.c
index 7323f51d4657eb1066a4974d6ebd001fb0bd979b..a891135fdd4772710481ff8607f9d7782cee7ff6 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -125,8 +125,6 @@ struct color_name {
     char *orig;
 };
 
-static struct color_name *color_names[3] = { NULL, NULL, NULL };
-
 struct color {
     const char *name;
     const char *code;
@@ -194,6 +192,23 @@ static const struct {
     { bg_colors, sizeof (bg_colors) / sizeof (struct color), "background" },
 };
 
+enum {
+    OPT_CLEAN = 1,
+    OPT_CLEAN_ALL,
+    OPT_EXCLUDE_RANDOM,
+    OPT_HELP,
+    OPT_VERSION
+};
+static int opt_type;
+static const struct option long_opts[] = {
+    { "clean",          no_argument,       &opt_type, OPT_CLEAN          },
+    { "clean-all",      no_argument,       &opt_type, OPT_CLEAN_ALL      },
+    { "exclude-random", required_argument, &opt_type, OPT_EXCLUDE_RANDOM },
+    { "help",           no_argument,       &opt_type, OPT_HELP           },
+    { "version",        no_argument,       &opt_type, OPT_VERSION        },
+    {  NULL,            0,                 NULL,      0                  },
+};
+
 static FILE *stream;
 #if DEBUG
 static FILE *log;
@@ -330,29 +345,11 @@ main (int argc, char **argv)
     goto PARSE_OPT;        \
 
 extern char *optarg;
-static int opt_type;
 
 static void
 process_opts (int argc, char **argv)
 {
-    enum {
-        OPT_CLEAN = 1,
-        OPT_CLEAN_ALL,
-        OPT_EXCLUDE_RANDOM,
-        OPT_HELP,
-        OPT_VERSION
-    };
-
     int opt;
-    struct option long_opts[] = {
-        { "clean",          no_argument,       &opt_type, OPT_CLEAN          },
-        { "clean-all",      no_argument,       &opt_type, OPT_CLEAN_ALL      },
-        { "exclude-random", required_argument, &opt_type, OPT_EXCLUDE_RANDOM },
-        { "help",           no_argument,       &opt_type, OPT_HELP           },
-        { "version",        no_argument,       &opt_type, OPT_VERSION        },
-        {  NULL,            0,                 NULL,      0                  },
-    };
-
     while ((opt = getopt_long (argc, argv, "hV", long_opts, NULL)) != -1)
       {
         PARSE_OPT:
@@ -417,6 +414,15 @@ print_hint (void)
 static void
 print_help (void)
 {
+    struct short_opt {
+        const char *name;
+        const char *short_opt;
+    };
+    const struct short_opt short_opts[] = {
+        { "help",    "h" },
+        { "version", "V" },
+    };
+    const struct option *opt = long_opts;
     unsigned int i;
 
     printf ("Usage: %s (foreground) OR (foreground)%c(background) OR --clean[-all] [-|file]\n\n", program_name, COLOR_SEP_CHAR);
@@ -438,11 +444,24 @@ print_help (void)
     printf ("\twhereas for lower case colors will be of normal intensity.\n");
 
     printf ("\n\tOptions\n");
-    printf ("\t\t    --clean\n");
-    printf ("\t\t    --clean-all\n");
-    printf ("\t\t    --exclude-random\n");
-    printf ("\t\t-h, --help\n");
-    printf ("\t\t-V, --version\n\n");
+    for (; opt->name; opt++)
+      {
+        const char *short_opt = NULL;
+        unsigned int i;
+        for (i = 0; i < sizeof (short_opts) / sizeof (struct short_opt); i++)
+          {
+            if (streq (opt->name, short_opts[i].name))
+              {
+                short_opt = short_opts[i].short_opt;
+                break;
+              }
+          }
+        if (short_opt)
+          printf ("\t\t-%s, --%s\n", short_opt, opt->name);
+        else
+          printf ("\t\t    --%s\n", opt->name);
+      }
+    printf ("\n");
 }
 
 static void
@@ -489,8 +508,6 @@ print_version (void)
 static void
 cleanup (void)
 {
-    free_color_names (color_names);
-
     if (stream && fileno (stream) != STDIN_FILENO)
       fclose (stream);
 #if DEBUG
@@ -513,9 +530,9 @@ free_color_names (struct color_name **color_names)
     unsigned int i;
     for (i = 0; color_names[i]; i++)
       {
-        free (color_names[i]->name);
-        free (color_names[i]->orig);
-        free_null (color_names[i]);
+        RELEASE_VAR (color_names[i]->name);
+        RELEASE_VAR (color_names[i]->orig);
+        RELEASE_VAR (color_names[i]);
       }
 }
 
@@ -525,6 +542,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct
     int ret;
     char *p;
     struct stat sb;
+    struct color_name *color_names[3] = { NULL, NULL, NULL };
 
     const char *color_string = arg_cnt >= 1 ? arg_strings[0] : NULL;
     const char *file_string  = arg_cnt == 2 ? arg_strings[1] : NULL;
@@ -722,13 +740,16 @@ gather_color_names (const char *color_string, bool *bold, struct color_name **co
           }
 
         color_names[index] = xcalloc (1, sizeof (struct color_name));
+        STACK_VAR (color_names[index]);
 
         color_names[index]->orig = xstrdup (color);
+        STACK_VAR (color_names[index]->orig);
 
         for (ch = color; *ch; ch++)
           *ch = tolower (*ch);
 
         color_names[index]->name = xstrdup (color);
+        STACK_VAR (color_names[index]->name);
       }
 
     RELEASE_VAR (str);