File xcolors-04oct91.patch of Package xcolors
--- xcolors.c
+++ xcolors.c
@@ -28,7 +28,7 @@
#include <math.h> /* for sqrt() */
#ifndef RGB_TXT
-#define RGB_TXT "/usr/lib/X11/rgb.txt"
+#define RGB_TXT "/usr/X11R6/lib/X11/rgb.txt"
#endif
String fallback_resources[] = {
@@ -263,6 +263,7 @@
XtMapWidget(toplevel);
XtAppMainLoop(app_context);
/* NOTREACHED */
+ return 0;
}
colordemo(parent, startcolor, nearcolor, maxdist)
@@ -273,6 +274,7 @@
{
int r, g, b, prev_r, prev_g, prev_b;
char colorname[50], save_colorname[50];
+ char temp_buffer[255];
FILE *rgb;
Bool do_color();
double ddist = maxdist;
@@ -285,6 +287,10 @@
prev_r = prev_g = prev_b = -1;
save_colorname[0] = '\0';
+
+ fscanf(rgb,"!%[^\n]\n", temp_buffer);
+ fscanf(rgb,"#%[^\n]\n", temp_buffer);
+
while (4 == fscanf(rgb, "%d %d %d %[^\n]\n", &r, &g, &b, colorname)) {
if (startcolor)
if (l_strcasecmp(colorname, startcolor))
@@ -316,7 +322,7 @@
fprintf(stderr, "%s: \"%s\" not found in %s\n",
program_name, startcolor, opts.rgb_file);
}
-
+ return 0;
}
--- xcolors.c.orig 2005-04-22 10:55:50.698562170 +0200
+++ ./xcolors.c 2005-04-22 11:35:37.841039462 +0200
@@ -24,6 +24,7 @@
#include <X11/Xaw/Box.h>
#include <X11/Xaw/Label.h>
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include <math.h> /* for sqrt() */
@@ -178,7 +179,7 @@ XtActionsRec actionTable[] = {
};
-main(argc, argv)
+int main(argc, argv)
int argc;
char *argv[];
{
@@ -266,6 +267,7 @@ main(argc, argv)
return 0;
}
+void
colordemo(parent, startcolor, nearcolor, maxdist)
Widget parent;
char *startcolor;
@@ -322,7 +324,7 @@ colordemo(parent, startcolor, nearcolor,
fprintf(stderr, "%s: \"%s\" not found in %s\n",
program_name, startcolor, opts.rgb_file);
}
- return 0;
+ return;
}