X-Git-Url: http://git.refcnt.org/?p=colorize.git;a=blobdiff_plain;f=colorize.c;h=1e27fcae01878ea6f41c90adac3c52aa7138317b;hp=8d5ca90ff32b5bee5df1bcb2fbc2ece5da6e5395;hb=13b184a21e6ede64a9cf16f20dd774ea8cd45c4f;hpb=c5aee0b6ea9709789396f90ad115dd16ac970b0b

diff --git a/colorize.c b/colorize.c
index 8d5ca90..1e27fca 100644
--- a/colorize.c
+++ b/colorize.c
@@ -222,6 +222,11 @@ enum attr_type {
     ATTR_REVERSE = 0x08,
     ATTR_CONCEALED = 0x10
 };
+struct attr {
+    const char *name;
+    unsigned int val;
+    enum attr_type type;
+};
 
 static FILE *stream;
 #if DEBUG
@@ -241,7 +246,7 @@ static const char *program_name;
 
 static void process_opts (int, char **);
 static void process_opt_attr (const char *);
-static void write_attr (unsigned int, unsigned int *, enum attr_type, const char *);
+static void write_attr (const struct attr *, unsigned int *);
 static void print_hint (void);
 static void print_help (void);
 static void print_version (void);
@@ -429,11 +434,7 @@ static void
 process_opt_attr (const char *p)
 {
     /* If attributes are added to this "list", also increase MAX_ATTRIBUTE_CHARS!  */
-    const struct attr {
-        const char *name;
-        unsigned int val;
-        enum attr_type type;
-    } attrs[] = {
+    const struct attr attrs[] = {
         { "bold",       1, ATTR_BOLD       },
         { "underscore", 4, ATTR_UNDERSCORE },
         { "blink",      5, ATTR_BLINK      },
@@ -458,16 +459,23 @@ process_opt_attr (const char *p)
             unsigned int i;
             for (i = 0; i < sizeof (attrs) / sizeof (struct attr); i++)
               {
-                size_t name_len = strlen (attrs[i].name);
+                const size_t name_len = strlen (attrs[i].name);
                 if ((size_t)(p - s) == name_len && strneq (s, attrs[i].name, name_len))
                   {
-                    write_attr (attrs[i].val, &attr_types, attrs[i].type, attrs[i].name);
+                    write_attr (&attrs[i], &attr_types);
                     valid_attr = true;
                     break;
                   }
               }
             if (!valid_attr)
-              vfprintf_fail (formats[FMT_GENERIC], "--attr switch must be provided valid attribute names");
+              {
+                char *sep;
+                char *attr_invalid = xstrdup (s);
+                STACK_VAR (attr_invalid);
+                if ((sep = strchr (attr_invalid, ',')))
+                  *sep = '\0';
+                vfprintf_fail ("--attr switch attribute '%s' is not valid", attr_invalid);
+              }
           }
         if (*p)
           p++;
@@ -475,8 +483,12 @@ process_opt_attr (const char *p)
 }
 
 static void
-write_attr (unsigned int val, unsigned int *attr_types, enum attr_type attr_type, const char *attr_name)
+write_attr (const struct attr *attr_i, unsigned int *attr_types)
 {
+    const unsigned int val = attr_i->val;
+    const enum attr_type attr_type = attr_i->type;
+    const char *attr_name = attr_i->name;
+
     if (*attr_types & attr_type)
       vfprintf_fail ("--attr switch has attribute '%s' twice or more", attr_name);
     snprintf (attr + strlen (attr), 3, "%u;", val);
@@ -552,22 +564,23 @@ print_version (void)
 #endif
     const char *version_prefix, *version_string;
     const char *c_flags, *ld_flags, *cpp_flags;
+    const char *const desc_flags_unknown = "unknown";
     struct bytes_size bytes_size;
     bool debug;
 #ifdef CFLAGS
     c_flags = to_str (CFLAGS);
 #else
-    c_flags = "unknown";
+    c_flags = desc_flags_unknown;
 #endif
 #ifdef LDFLAGS
     ld_flags = to_str (LDFLAGS);
 #else
-    ld_flags = "unknown";
+    ld_flags = desc_flags_unknown;
 #endif
 #ifdef CPPFLAGS
     cpp_flags = to_str (CPPFLAGS);
 #else
-    cpp_flags = "unknown";
+    cpp_flags = desc_flags_unknown;
 #endif
 #if DEBUG
     debug = true;
@@ -768,15 +781,15 @@ skip_path_colors (const char *color_string, const char *file_string, const struc
 
     if (have_file)
       {
-        const char *file_exists = color_string;
+        const char *file_existing = color_string;
         if (file_string)
-          vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "cannot be used as color string");
+          vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_existing, "cannot be used as color string");
         else
           {
             if (VALID_FILE_TYPE (mode))
-              vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "must be preceded by color string");
+              vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_existing, "must be preceded by color string");
             else
-              vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "is not a valid file type");
+              vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_existing, "is not a valid file type");
           }
       }
 }
@@ -958,7 +971,7 @@ complete_part_line (const char *p, char **buf, FILE *stream)
             if (read_from_stream)
               save_char (ch, buf, &i, &size);
           }
-        else /* read next character */
+        else /* got next character */
           {
             got_next_char = true;
             break;