From aab865e8473a06e0f9408daee27701931e896e50 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Mon, 14 Oct 2002 18:48:01 +0000
Subject: [PATCH] Classify images.

CVS patchset: 5774
CVS date: 2002/10/14 18:48:01
---
 build/rpmfc.c | 43 ++++++++++++++++++++++++-------------------
 build/rpmfc.h | 13 ++++++++-----
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 6ec8860c0..79aaf9789 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -11,36 +11,40 @@
  */
 /*@unchecked@*/ /*@observer@*/
 static struct fclassTokens_s fclassTokens[] = {
+  { "directory",		RPMFC_DIRECTORY|RPMFC_INCLUDE },
+
+  { " shared object",		RPMFC_LIBRARY },
+  { " executable",		RPMFC_EXECUTABLE },
+  { " statically linked",	RPMFC_STATIC },
+  { " not stripped",		RPMFC_NOTSTRIPPED },
+  { " archive",			RPMFC_ARCHIVE },
+
   { "ELF 32-bit",		RPMFC_ELF32|RPMFC_INCLUDE },
   { "ELF 64-bit",		RPMFC_ELF64|RPMFC_INCLUDE },
-  { "executable",		RPMFC_EXECUTABLE },
-  { "script",			RPMFC_SCRIPT },
-  { "text",			RPMFC_TEXT },
-  { "document",			RPMFC_DOCUMENT },
 
-  { "directory",		RPMFC_DIRECTORY|RPMFC_INCLUDE },
+  { " script",			RPMFC_SCRIPT },
+  { " text",			RPMFC_TEXT },
+  { " document",		RPMFC_DOCUMENT },
+
+  { " compressed",		RPMFC_COMPRESSED },
 
-  { "statically linked",	RPMFC_STATIC },
-  { "not stripped",		RPMFC_NOTSTRIPPED },
-  { "compressed",		RPMFC_COMPRESSED },
-  { "font",			RPMFC_FONT },
+  { "troff or preprocessor input",		RPMFC_MANPAGE },
 
   { "current ar archive",	RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
-  { " font",			RPMFC_FONT|RPMFC_INCLUDE },
-  { " Font",			RPMFC_FONT|RPMFC_INCLUDE },
 
   { "Zip archive data",		RPMFC_COMPRESSED|RPMFC_ARCHIVE|RPMFC_INCLUDE },
   { "tar archive",		RPMFC_ARCHIVE|RPMFC_INCLUDE },
   { "cpio archive",		RPMFC_ARCHIVE|RPMFC_INCLUDE },
   { "RPM v3",			RPMFC_ARCHIVE|RPMFC_INCLUDE },
 
-  { "shell script",		RPMFC_SCRIPT|RPMFC_INCLUDE },
-  { "awk script",		RPMFC_SCRIPT|RPMFC_INCLUDE },
-  { "perl script",		RPMFC_SCRIPT|RPMFC_INCLUDE },
-  { "python script",		RPMFC_SCRIPT|RPMFC_INCLUDE },
+  { " image",			RPMFC_IMAGE|RPMFC_INCLUDE },
+  { " font",			RPMFC_FONT|RPMFC_INCLUDE },
+  { " Font",			RPMFC_FONT|RPMFC_INCLUDE },
+
+  { " commands",		RPMFC_SCRIPT|RPMFC_INCLUDE },
+  { " script",			RPMFC_SCRIPT|RPMFC_INCLUDE },
 
-  { "python compiled",		RPMFC_SCRIPT|RPMFC_INCLUDE },
-  { "PHP script",		RPMFC_SCRIPT|RPMFC_INCLUDE },
+  { "python compiled",		RPMFC_WHITE|RPMFC_INCLUDE },
 
   { "empty",			RPMFC_WHITE|RPMFC_INCLUDE },
 
@@ -58,6 +62,8 @@ static struct fclassTokens_s fclassTokens[] = {
   { "ISO-8859 text",		RPMFC_WHITE|RPMFC_INCLUDE },
 
   { "symbolic link to",		RPMFC_SYMLINK },
+  { "socket",			RPMFC_DEVICE },
+  { "special",			RPMFC_DEVICE },
 
   { "ASCII",			RPMFC_WHITE },
   { "ISO-8859",			RPMFC_WHITE },
@@ -72,7 +78,6 @@ static struct fclassTokens_s fclassTokens[] = {
   { "format",			RPMFC_WHITE },
   { "message",			RPMFC_WHITE },
   { "program",			RPMFC_WHITE },
-  { "text",			RPMFC_WHITE },
 
   { "broken symbolic link to ",	RPMFC_WHITE|RPMFC_ERROR },
   { "can't read",		RPMFC_WHITE|RPMFC_ERROR },
@@ -85,7 +90,7 @@ static struct fclassTokens_s fclassTokens[] = {
 
 /*@unchecked@*/
 static int fcolorIgnore =
-    (RPMFC_ELF32|RPMFC_ELF64|RPMFC_DIRECTORY|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_FONT|RPMFC_SCRIPT|RPMFC_WHITE);
+    (RPMFC_ELF32|RPMFC_ELF64|RPMFC_DIRECTORY|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_FONT|RPMFC_SCRIPT|RPMFC_IMAGE|RPMFC_WHITE);
 
 int fclassColoring(const char * fmstr)
 {
diff --git a/build/rpmfc.h b/build/rpmfc.h
index c9229725b..b92c25f0f 100644
--- a/build/rpmfc.h
+++ b/build/rpmfc.h
@@ -22,18 +22,21 @@ enum FCOLOR_e {
     RPMFC_EXECUTABLE		= (1 <<  2),
     RPMFC_SCRIPT		= (1 <<  3),
     RPMFC_TEXT			= (1 <<  4),
+    RPMFC_DOCUMENT		= (1 <<  5),
 
     RPMFC_DIRECTORY		= (1 <<  8),
-    RPMFC_LIBRARY		= (1 <<  9),
-    RPMFC_DOCUMENT		= (1 << 10),
+    RPMFC_SYMLINK		= (1 <<  9),
+    RPMFC_DEVICE		= (1 << 10),
 
     RPMFC_STATIC		= (1 << 16),
-    RPMFC_NOTSTRIPPED		= (1 << 18),
-    RPMFC_COMPRESSED		= (1 << 19),
+    RPMFC_NOTSTRIPPED		= (1 << 17),
+    RPMFC_COMPRESSED		= (1 << 18),
 
-    RPMFC_SYMLINK		= (1 << 24),
+    RPMFC_LIBRARY		= (1 << 24),
     RPMFC_ARCHIVE		= (1 << 25),
     RPMFC_FONT			= (1 << 26),
+    RPMFC_IMAGE			= (1 << 27),
+    RPMFC_MANPAGE		= (1 << 28),
 
     RPMFC_WHITE			= (1 << 29),
     RPMFC_INCLUDE		= (1 << 30),
-- 
2.34.1