has_color_name(): return true from else branch

[colorize.git] / colorize.c

diff --git a/colorize.c b/colorize.c
index b9e5c49fb77336286d5e44ab047dc61204c75757..9e0f57490adae9dec651c74510ee9d0cfed99605 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -73,7 +73,7 @@
 #define LF 0x01
 #define CR 0x02
 
-#define SKIP_LINE_ENDINGS(flags) (((flags) & CR) && ((flags) & LF) ? 2 : 1)
+#define SKIP_LINE_ENDINGS(flags) ((flags) == (CR|LF) ? 2 : 1)
 
 #define VALID_FILE_TYPE(mode) (S_ISREG (mode) || S_ISLNK (mode) || S_ISFIFO (mode))
 
@@ -122,7 +122,7 @@
 
 #define MAX_ATTRIBUTE_CHARS (6 * 2)
 
-#define VERSION "0.62"
+#define VERSION "0.63"
 
 typedef enum { false, true } bool;
 
@@ -1448,16 +1448,16 @@ has_color_name (const char *str, const char *name)
 {
     char *p;
 
-    assert (strlen (str));
-    assert (strlen (name));
+    assert (strlen (str) > 0);
+    assert (strlen (name) > 0);
 
     if (!(*str == *name || *str == toupper (*name)))
       return false;
     else if (*(name + 1) != '\0'
      && !((p = strstr (str + 1, name + 1)) && p == str + 1))
       return false;
-
-    return true;
+    else
+      return true;
 }
 
 static FILE *