* authorization. *
****************************************************************************/
/*
- * $Id: picsmap.c,v 1.118 2018/03/24 22:37:42 tom Exp $
+ * $Id: picsmap.c,v 1.123 2018/06/16 22:55:45 tom Exp $
*
* Author: Thomas E. Dickey
*
#if HAVE_TSEARCH
#include <search.h>
+#if HAVE_TDESTROY && !defined(_GNU_SOURCE)
+#undef HAVE_TDESTROY
+#define HAVE_TDESTROY 0
+#endif
#endif
#undef CUR /* use only the curses interface */
strcpy(s, filename);
if (tries & 4) {
char *t = s;
+ char *tc;
int num;
char chr;
int found = 0;
if (*t == '-') {
if (sscanf(t, "-%d%c", &num, &chr) == 2 &&
chr == 'c' &&
- !(strncmp) (strchr(t, chr), "color", 5)) {
+ (tc = strchr(t, chr)) != 0 &&
+ !(strncmp) (tc, "color", 5)) {
found = 1;
}
break;
} else if ((t = strstr(buf, "_height")) != 0) {
state |= 2;
result->high = (short) num;
+ } else {
+ break;
}
*t = '\0';
if (result->name) {
if (num_colors >= result->colors) {
finish_c_values(result);
state = 4;
- if (list != 0 && list[0] == 0)
+ if (list[0] == 0)
list[0] = strdup("\033");
}
break;
if (j < 10)
++digits;
}
+ if (digits > 8)
+ digits = 8;
logmsg("These colors were used:");
high = (pics->colors + wide - 1) / wide;
for (j = 0; j < high && j < pics->colors; ++j) {