/****************************************************************************
- * Copyright (c) 2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2017-2018,2019 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
- * $Id: picsmap.c,v 1.114 2017/12/16 23:49:40 tom Exp $
+ * $Id: picsmap.c,v 1.128 2019/02/02 20:03:13 tom Exp $
*
* Author: Thomas E. Dickey
*
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef HAVE_STDINT_H
+#if HAVE_STDINT_H
#include <stdint.h>
#define my_intptr_t intptr_t
#else
#define L_CURLY '{'
#define R_CURLY '}'
+#define MaxSCALE 1000 /* input curses ranges 0..1000 */
+#define MaxRGB 255 /* output color ranges 0..255 */
#define okCOLOR(n) ((n) >= 0 && (n) < COLORS)
-#define okRGB(n) ((n) >= 0 && (n) <= 1000)
-#define Scaled256(n) (NCURSES_COLOR_T) (int)(((n) * 1000.0) / 256)
-#define ScaledColor(n) (NCURSES_COLOR_T) (int)(((n) * 1000.0) / scale)
+#define okSCALE(n) ((n) >= 0 && (n) <= MaxSCALE)
+#define Scaled256(n) (NCURSES_COLOR_T) (int)(((double)(n) * MaxSCALE) / 255)
+#define ScaledColor(n) (NCURSES_COLOR_T) (int)(((double)(n) * MaxSCALE) / scale)
#ifndef RGB_PATH
#define RGB_PATH "/etc/X11/rgb.txt"
#define debugmsg2 if (debugging) logmsg2
static void cleanup(int) GCC_NORETURN;
-static void giveup(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
-static void logmsg(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
-static void logmsg2(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
-static void warning(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
+static void giveup(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
+static void logmsg(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
+static void logmsg2(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
+static void warning(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
static int gather_c_values(int);
static FILE *logfp = 0;
static void *reading_ntree;
#endif
-#if HAVE_ALLOC_PAIR && HAVE_INIT_EXTENDED_COLOR
+#if HAVE_ALLOC_PAIR && USE_EXTENDED_COLOR
#define USE_EXTENDED_COLORS 1
static bool use_extended_pairs = FALSE;
static bool use_extended_colors = FALSE;
#endif
static void
-logmsg(const char *fmt,...)
+logmsg(const char *fmt, ...)
{
if (logfp != 0) {
va_list ap;
}
static void
-logmsg2(const char *fmt,...)
+logmsg2(const char *fmt, ...)
{
if (logfp != 0) {
va_list ap;
}
static void
-warning(const char *fmt,...)
+warning(const char *fmt, ...)
{
if (logfp != 0) {
va_list ap;
reading_ncols = 0;
}
-#if HAVE_TSEARCH && HAVE_TDESTROY
-static void
-never_free(void *node GCC_UNUSED)
-{
-}
-#endif
-
static void
dispose_c_values(void)
{
#if HAVE_TSEARCH
if (reading_ntree != 0) {
-#if HAVE_TDESTROY
- tdestroy(reading_ntree, never_free);
-#else
int n;
for (n = 0; n < reading_last; ++n) {
tdelete(I2P(n), &reading_ntree, compare_c_values);
}
-#endif
reading_ntree = 0;
}
#endif
}
static void
-giveup(const char *fmt,...)
+giveup(const char *fmt, ...)
{
va_list ap;
{
static const char *data_dir = DATA_DIR;
char **result = 0;
- char *full_name = malloc(strlen(data_dir) + 20 + strlen(filename));
+ size_t last = strlen(filename);
+ size_t need = (strlen(data_dir) + 20 + last);
+ char *full_name = malloc(need);
char *s;
struct stat sb;
*(s = full_name) = '\0';
if (tries & 1) {
if (strchr(filename, '/') == 0) {
- sprintf(full_name, "%s/", data_dir);
+ _nc_SPRINTF(full_name, _nc_SLIMIT(need) "%s/", data_dir);
} else {
continue;
}
}
s += strlen(s);
+ if (((size_t) (s - full_name) + last + 1) >= need)
+ continue;
- strcpy(s, filename);
+ _nc_STRCAT(full_name, filename, need);
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;
++t;
}
if (found && (t != s)
- && strncmp(s, "xterm", (size_t) (t - s))) {
- sprintf(s, "xterm%s", filename + (t - s));
+ && (strncmp) (s, "xterm", (size_t) (t - s))) {
+ _nc_SPRINTF(s, _nc_SLIMIT(need - (size_t) (s - full_name))
+ "xterm%s", filename + (t - s));
} else {
continue;
}
if (tries & 2) {
int len = (int) strlen(filename);
if (len <= 4 || strcmp(filename + len - 4, ".dat")) {
- strcpy(s, ".dat");
+ _nc_STRCAT(full_name, ".dat", need);
} else {
continue;
}
if (data != 0) {
int n;
int red, green, blue;
- int scale = 1000;
+ int scale = MaxSCALE;
int c;
for (n = 0; data[n] != 0; ++n) {
if (sscanf(data[n], "scale:%d", &c) == 1) {
&green,
&blue) == 4
&& okCOLOR(c)
- && okRGB(red)
- && okRGB(green)
- && okRGB(blue)) {
+ && okSCALE(red)
+ && okSCALE(green)
+ && okSCALE(blue)) {
/* *INDENT-EQLS* */
all_colors[c].red = ScaledColor(red);
all_colors[c].green = ScaledColor(green);
return value;
}
-static int match_c(const char *, const char *,...) GCC_SCANFLIKE(2,3);
+static int match_c(const char *, const char *, ...) GCC_SCANFLIKE(2,3);
static char *
skip_s(char *s)
}
static int
-match_c(const char *source, const char *pattern,...)
+match_c(const char *source, const char *pattern, ...)
{
int limit = (int) strlen(source);
const char *last_s = source + limit;
} else if ((t = strstr(buf, "_height")) != 0) {
state |= 2;
result->high = (short) num;
+ } else {
+ break;
}
*t = '\0';
if (result->name) {
if (isdigit(UChar(*s))) {
long value = strtol(s, &t, 0);
int b;
- if (t != s || value > 255 || value < 0) {
+ if (t != s || value > MaxRGB || value < 0) {
s = t;
} else {
state = -1;
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;
/* should not happen... */
continue;
}
- if (!strncmp(cs, list[c], (size_t) cpp)) {
+ if (!(strncmp) (cs, list[c], (size_t) cpp)) {
result->cells[which].ch = list[c][0];
result->cells[which].fg = c;
result->fgcol[c].count++;
static PICS_HEAD *
parse_img(const char *filename)
{
- char *cmd = malloc(strlen(filename) + 256);
+ size_t need = strlen(filename) + 256;
+ char *cmd = malloc(need);
FILE *pp;
char buffer[BUFSIZ];
char dummy[BUFSIZ];
int pic_y = 0;
int width = in_curses ? COLS : 80;
- sprintf(cmd, "identify \"%s\"", filename);
+ _nc_SPRINTF(cmd, _nc_SLIMIT(need) "identify \"%s\"", filename);
if (quiet)
- strcat(cmd, " 2>/dev/null");
+ _nc_STRCAT(cmd, " 2>/dev/null", need);
logmsg("...opening pipe to %s", cmd);
size_t n = strlen(filename);
debugmsg2("...read %s", buffer);
if (strlen(buffer) > n &&
- !strncmp(buffer, filename, n) &&
+ !(strncmp) (buffer, filename, n) &&
isspace(UChar(buffer[n])) &&
sscanf(skip_word(buffer + n), " %dx%d ", &pic_x, &pic_y) == 2) {
/* distort image to make it show normally on terminal */
if (pic_x <= 0 || pic_y <= 0)
goto finish;
- sprintf(cmd, "convert " "-resize %dx%d\\! " "-thumbnail %dx \"%s\" "
- "-define txt:compliance=SVG txt:-",
- pic_x, pic_y, width, filename);
+ _nc_SPRINTF(cmd, _nc_SLIMIT(need)
+ "convert " "-resize %dx%d\\! " "-thumbnail %dx \"%s\" "
+ "-define txt:compliance=SVG txt:-",
+ pic_x, pic_y, width, filename);
if (quiet)
- strcat(cmd, " 2>/dev/null");
+ _nc_STRCAT(cmd, " 2>/dev/null", need);
logmsg("...opening pipe to %s", cmd);
if ((pp = popen(cmd, "r")) != 0) {
&check)) {
if ((s - t) > 8) /* 6 hex digits vs 8 */
check /= 256;
- if (r > 255 ||
- g > 255 ||
- b > 255 ||
+ if (r > MaxRGB ||
+ g > MaxRGB ||
+ b > MaxRGB ||
check != (unsigned) ((r << 16) | (g << 8) | b)) {
okay = FALSE;
break;
debugmsg("called show_picture");
logmsg("...using %dx%d screen", LINES, COLS);
-#if USE_EXTENDED_COLORS
+#if HAVE_RESET_COLOR_PAIRS
reset_color_pairs();
#elif HAVE_CURSCR
wclear(curscr);
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) {
*s = '\0';
for (k = 0; k < wide; ++k) {
int n = j + (k * high);
+ size_t want = (sizeof(buffer) - (size_t) (s - buffer));
+ if (want < 100)
+ break;
if (n >= pics->colors)
break;
if (k) {
*s++ = ' ';
if (digits < 8) {
- sprintf(s, "%*s", 8 - digits, " ");
+ _nc_SPRINTF(s, _nc_SLIMIT(want) "%*s", 8 - digits,
+ " ");
s += strlen(s);
}
}
if (pics->fgcol[n].fgcol >= 0) {
- sprintf(s, "%3d #%06X %*d", n,
- pics->fgcol[n].fgcol,
- digits, pics->fgcol[n].count);
+ _nc_SPRINTF(s, _nc_SLIMIT(want) "%3d #%06X %*d", n,
+ pics->fgcol[n].fgcol,
+ digits, pics->fgcol[n].count);
} else {
- sprintf(s, "%3d (empty) %*d", n,
- digits, pics->fgcol[n].count);
+ _nc_SPRINTF(s, _nc_SLIMIT(want) "%3d (empty) %*d", n,
+ digits, pics->fgcol[n].count);
}
s += strlen(s);
if ((s - buffer) > 100)