/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2011 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 *
* scroll operation worked, and the refresh() code only had to do a
* partial repaint.
*
- * $Id: view.c,v 1.70 2008/11/16 00:19:59 juergen Exp $
+ * $Id: view.c,v 1.83 2011/05/21 18:40:49 tom Exp $
*/
#include <test.priv.h>
#if USE_WIDEC_SUPPORT
#if HAVE_MBTOWC && HAVE_MBLEN
-#define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
+#define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
#define count_mbytes(buffer,length,state) mblen(buffer,length)
#define check_mbytes(wch,buffer,length,state) \
(int) mbtowc(&wch, buffer, length)
static NCURSES_CH_T **lptr;
static int num_lines;
+static void usage(void) GCC_NORETURN;
+
static void
usage(void)
{
{
int result = 0;
#if USE_WIDEC_SUPPORT
+ int count;
#endif
#if USE_WIDEC_SUPPORT
- while (getcchar(src++, NULL, NULL, NULL, NULL) > 0)
- result++;
+ for (;;) {
+ TEST_CCHAR(src, count, {
+ ++result;
+ ++src;
+ }
+ , {
+ break;
+ })
+ }
#else
while (*src++)
result++;
static NCURSES_CH_T *
ch_dup(char *src)
{
- unsigned len = strlen(src);
+ unsigned len = (unsigned) strlen(src);
NCURSES_CH_T *dst = typeMalloc(NCURSES_CH_T, len + 1);
- unsigned j, k;
+ size_t j, k;
#if USE_WIDEC_SUPPORT
wchar_t wstr[CCHARW_MAX + 1];
wchar_t wch;
#endif
for (j = k = 0; j < len; j++) {
#if USE_WIDEC_SUPPORT
- rc = check_mbytes(wch, src + j, len - j, state);
+ rc = (size_t) check_mbytes(wch, src + j, len - j, state);
if (rc == (size_t) -1 || rc == (size_t) -2)
break;
j += rc - 1;
wstr[l++] = L' ';
wstr[l++] = wch;
#else
- dst[k++] = src[j];
+ dst[k++] = (chtype) UChar(src[j]);
#endif
}
#if USE_WIDEC_SUPPORT
if (optind + 1 != argc)
usage();
- if ((vec_lines = typeMalloc(NCURSES_CH_T *, MAXLINES + 2)) == 0)
+ if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) MAXLINES + 2)) == 0)
usage();
+ assert(vec_lines != 0);
+
fname = argv[optind];
if ((fp = fopen(fname, "r")) == 0) {
perror(fname);
} else {
sprintf(d, "\\%03o", UChar(*s));
d += strlen(d);
- col = (d - temp);
+ col = (int) (d - temp);
}
#endif
}
*lptr = ch_dup(temp);
}
(void) fclose(fp);
- num_lines = lptr - vec_lines;
+ num_lines = (int) (lptr - vec_lines);
(void) initscr(); /* initialize the curses library */
keypad(stdscr, TRUE); /* enable keyboard mapping */
if (!got_number)
show_all(my_label);
- n = 0;
for (;;) {
#if CAN_RESIZE
if (interrupted) {
waiting = FALSE;
if ((c < 127) && isdigit(c)) {
if (!got_number) {
- mvprintw(0, 0, "Count: ");
+ MvPrintw(0, 0, "Count: ");
clrtoeol();
}
addch(UChar(c));
lptr++;
else
break;
- scrl(lptr - olptr);
+ scrl((int) (lptr - olptr));
break;
case KEY_UP:
lptr--;
else
break;
- scrl(lptr - olptr);
+ scrl((int) (lptr - olptr));
break;
case 'h':
#if CAN_RESIZE
/*
- * This uses functions that are "unsafe", but it seems to work on SunOS and
- * Linux. Usually: the "unsafe" refers to the functions that POSIX lists
- * which may be called from a signal handler. Those do not include buffered
- * I/O, which is used for instance in wrefresh(). To be really portable, you
- * should use the KEY_RESIZE return (which relies on ncurses' sigwinch
- * handler).
+ * This uses functions that are "unsafe", but it seems to work on SunOS.
+ * Usually: the "unsafe" refers to the functions that POSIX lists which may be
+ * called from a signal handler. Those do not include buffered I/O, which is
+ * used for instance in wrefresh(). To be really portable, you should use the
+ * KEY_RESIZE return (which relies on ncurses' sigwinch handler).
*
* The 'wrefresh(curscr)' is needed to force the refresh to start from the top
* of the screen -- some xterms mangle the bitmap while resizing.
if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
resize_term(size.ws_row, size.ws_col);
- wrefresh(curscr); /* Linux needs this */
+ wrefresh(curscr);
show_all(sig ? "SIGWINCH" : "interrupt");
}
interrupted = FALSE;
#if CAN_RESIZE
sprintf(temp, "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
- i = strlen(temp);
- if ((i + 7) < (int) sizeof(temp))
- sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
+ i = (int) strlen(temp);
+ if ((i + 7) < (int) sizeof(temp)) {
+ sprintf(temp + i, "view %.*s",
+ (int) (sizeof(temp) - 7 - (size_t) i),
+ fname);
+ }
#else
(void) tag;
sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname);
clrtoeol();
this_time = time((time_t *) 0);
strcpy(temp, ctime(&this_time));
- if ((i = strlen(temp)) != 0) {
+ if ((i = (int) strlen(temp)) != 0) {
temp[--i] = 0;
if (move(0, COLS - i - 2) != ERR)
printw(" %s", temp);