r73 - trunk/filo/main/grub

Author: oxygene
Date: 2008-09-30 23:14:11 +0200 (Tue, 30 Sep 2008)
New Revision: 73

Modified:
   trunk/filo/main/grub/builtins.c
Log:
revert my color patch

Modified: trunk/filo/main/grub/builtins.c
===================================================================
--- trunk/filo/main/grub/builtins.c	2008-09-30 10:40:03 UTC (rev 72)
+++ trunk/filo/main/grub/builtins.c	2008-09-30 21:14:11 UTC (rev 73)
@@ -182,6 +182,12 @@
    	/* Terminate the string STR.  */
    	*ptr++ = 0;

+		/* If STR contains the prefix "blink-", then set the `blink' bit in COLOR.  */
+		if (substring("blink-", str) <= 0) {
+			color = 0x80;
+			str += 6;
+		}
+
    	/* Search for the color name.  */
    	for (i = 0; i < 16; i++)
    		if (strcmp(color_list[i], str) == 0) {
@@ -196,13 +202,13 @@
    	nul_terminate(str);

/* Search for the color name.  */
-		for (i = 0; i < 16; i++)
+		for (i = 0; i < 8; i++)
    		if (strcmp(color_list[i], str) == 0) {
    			color |= i;
    			break;
    		}

-		if (i == 16)
+		if (i == 8)
    		return -1;

return color;