Changeset 903:1602a69ee439 for color.c

Timestamp:

1999-07-06 15:42:25 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

mutt-1-0-stable

Message:

Fix color problem noted by Todd Larson. From unstable.

Files:

• color.c (modified) (5 diffs)

color.c

@@ -154 +154 @@
 
 #ifdef USE_SLANG_CURSES
-static char * get_color_name (int val)
+static char *get_color_name (char *dest, size_t destlen, int val)
 {
   static char * missing[3] = {"brown", "lightgray", ""};
@@ -162 +162 @@
   {
     case COLOR_YELLOW:
-      return (missing[0]);
+      strfcpy (dest, missing[0], destlen);
+      return dest;
 
     case COLOR_WHITE:
-      return (missing[1]);
+      strfcpy (dest, missing[1], destlen);
+      return dest;
       
     case COLOR_DEFAULT:
-      return (missing[2]);
+      strfcpy (dest, missing[2], destlen);
+      return dest;
   }
 
@@ -174 +177 @@
   {
     if (Colors[i].value == val)
-      return (Colors[i].name);
-  }
-  return (Colors[0].name);
+    {
+      strfcpy (dest, Colors[i].name, destlen);
+      return dest;
+    }
+  }
+
+  /* Sigh. If we got this far, the color is of the form 'colorN'
+   * Slang can handle this itself, so just return 'colorN'
+   */
+
+  snprintf (dest, destlen, "color%d", val);
+  return dest;
 }
 #endif
@@ -184 +196 @@
   COLOR_LIST *p = ColorList;
   int i;
+  
+#if defined (USE_SLANG_CURSES)
+  char fgc[SHORT_STRING], bgc[SHORT_STRING];
+#endif
 
   /* check to see if this color is already allocated to save space */
@@ -224 +240 @@
 #if defined (USE_SLANG_CURSES)
   if (fg == COLOR_DEFAULT || bg == COLOR_DEFAULT)
-    SLtt_set_color (i, NULL, get_color_name (fg), get_color_name (bg));
+    SLtt_set_color (i, NULL, get_color_name (fgc, sizeof (fgc), fg), get_color_name (bgc, sizeof (bgc), bg));
   else
 #elif defined (HAVE_USE_DEFAULT_COLORS)