Convert short version option to uppercase

[colorize.git] / colorize.c

diff --git a/colorize.c b/colorize.c
index cc89193ac8db8f5c70d283d704c10bd203ac7874..9bd5c78d6bb14f7826bcaf141b30eb1f134b42e8 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -286,7 +286,7 @@ main (int argc, char **argv)
     log = open_file (DEBUG_FILE, "w");
 #endif
 
-    while ((opt = getopt_long (argc, argv, "hv", long_opts, NULL)) != -1)
+    while ((opt = getopt_long (argc, argv, "hV", long_opts, NULL)) != -1)
       {
         PARSE_OPT:
         switch (opt)
@@ -330,7 +330,7 @@ main (int argc, char **argv)
               break;
             case 'h':
               SET_OPT_TYPE (OPT_HELP);
-            case 'v':
+            case 'V':
               SET_OPT_TYPE (OPT_VERSION);
             case '?':
               print_hint ();
@@ -411,7 +411,7 @@ print_help (void)
     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");
+    printf ("\t\t-V, --version\n\n");
 }
 
 static void
@@ -471,7 +471,7 @@ cleanup (void)
         unsigned int i;
         for (i = 0; i < stacked_vars; i++)
           if (vars_list[i])
-            free_null (vars_list[i]);
+            free (vars_list[i]);
 
         free_null (vars_list);
       }
@@ -483,8 +483,8 @@ free_color_names (struct color_name **color_names)
     unsigned int i;
     for (i = 0; color_names[i]; i++)
       {
-        free_null (color_names[i]->name);
-        free_null (color_names[i]->orig);
+        free (color_names[i]->name);
+        free (color_names[i]->orig);
         free_null (color_names[i]);
       }
 }
@@ -610,7 +610,6 @@ process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct
                   break;
                 case BACKGROUND:
                   vfprintf_fail (formats[FMT_COLOR], tables[BACKGROUND].desc, color, "cannot be bold");
-                  break;
                 default: /* never reached */
                   ABORT_TRACE ();
               }
@@ -671,7 +670,7 @@ process_file_arg (const char *file_string, const char **file, FILE **stream)
             int ret;
 
             errno = 0;
-            ret = lstat (file, &sb);
+            ret = stat (file, &sb);
 
             if (ret == -1)
               vfprintf_fail (formats[FMT_FILE], file, strerror (errno));
@@ -981,7 +980,7 @@ print_free_offsets (const char *line, char ***offsets, unsigned int count)
           RESTORE_CHAR (offsets[i + 1][0], ch);
       }
     for (i = 0; i < count; i++)
-      free_null (offsets[i]);
+      free (offsets[i]);
     free_null (offsets);
 }