/****************************************************************************
- * Copyright (c) 2017,2019 Free Software Foundation, Inc. *
+ * Copyright 2019-2020,2021 Thomas E. Dickey *
+ * Copyright 2017 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 *
/*
* clone of view.c, using pads
*
- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
+ * $Id: padview.c,v 1.18 2021/06/12 23:16:31 tom Exp $
*/
#include <test.priv.h>
#if HAVE_NEWPAD
-static void finish(int sig) GCC_NORETURN;
+static GCC_NORETURN void finish(int sig);
#define my_pair 1
static bool n_option = FALSE;
#endif
-static void usage(void) GCC_NORETURN;
+static GCC_NORETURN void usage(void);
static void
failed(const char *msg)
}
len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
- my_blob[sb.st_size] = '\0';
fclose(fp);
+ if (len > (size_t) sb.st_size)
+ len = (size_t) sb.st_size;
+ my_blob[len] = '\0';
+
for (pass = 0; pass < 2; ++pass) {
char *base = my_blob;
k = 0;
++k;
}
}
+ if (base != (my_blob + j)) {
+ if (pass)
+ my_vec[k] = base;
+ ++k;
+ }
num_lines = k;
- if (base != (my_blob + j))
- ++num_lines;
- if (!pass &&
- ((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
- failed("cannot allocate line-vector #1");
+ if (pass == 0) {
+ if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
+ failed("cannot allocate line-vector #1");
+ }
+ } else {
+ if (my_vec[0] == NULL)
+ my_vec[0] = my_blob;
}
}
failed("cannot allocate pad workspace");
if (try_color) {
wattrset(my_pad, COLOR_PAIR(my_pair));
- wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
+ wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
}
/*
int tvalue = (int) strtol(optarg, &next, 0);
if (tvalue < 0 || (next != 0 && *next != 0))
usage();
- trace((unsigned) tvalue);
+ curses_trace((unsigned) tvalue);
}
break;
case 't':
- trace(TRACE_CALLS);
+ curses_trace(TRACE_CALLS);
break;
#endif
default:
nodelay(stdscr, TRUE);
idlok(stdscr, TRUE); /* allow use of insert/delete line */
- my_pad = read_file(fname = argv[optind]);
-
if (try_color) {
if (has_colors()) {
start_color();
init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
- bkgd((chtype) COLOR_PAIR(my_pair));
+ bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
} else {
try_color = FALSE;
}
}
+ /*
+ * Do this after starting color, otherwise the pad's background will be
+ * uncolored after the ncurses 6.1.20181208 fixes.
+ */
+ my_pad = read_file(fname = argv[optind]);
+
my_row = 0;
while (!done) {
int n, c;