/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 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.64 2006/05/20 15:37:03 tom Exp $
+ * $Id: view.c,v 1.69 2008/09/06 22:10:50 tom Exp $
*/
#include <test.priv.h>
#include <sys/ptem.h>
#endif
+#if USE_WIDEC_SUPPORT
+#if HAVE_MBTOWC && HAVE_MBLEN
+#define reset_mbytes(state) mblen(NULL, 0), 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)
+#define state_unused
+#elif HAVE_MBRTOWC && HAVE_MBRLEN
+#define reset_mbytes(state) init_mb(state)
+#define count_mbytes(buffer,length,state) mbrlen(buffer,length,&state)
+#define check_mbytes(wch,buffer,length,state) \
+ (int) mbrtowc(&wch, buffer, length, &state)
+#else
+make an error
+#endif
+#endif /* USE_WIDEC_SUPPORT */
+
static RETSIGTYPE finish(int sig) GCC_NORETURN;
static void show_all(const char *tag);
wchar_t wstr[CCHARW_MAX + 1];
wchar_t wch;
int l = 0;
- mbstate_t state;
size_t rc;
int width;
+#ifndef state_unused
+ mbstate_t state;
#endif
+#endif /* USE_WIDEC_SUPPORT */
#if USE_WIDEC_SUPPORT
- memset(&state, 0, sizeof(state));
+ reset_mbytes(state);
#endif
for (j = k = 0; j < len; j++) {
#if USE_WIDEC_SUPPORT
- rc = mbrtowc(&wch, src + j, len - j, &state);
+ rc = check_mbytes(wch, src + j, len - j, state);
if (rc == (size_t) -1 || rc == (size_t) -2)
break;
j += rc - 1;
(void) signal(SIGINT, finish); /* arrange interrupts to terminate */
#endif
- while ((i = getopt(argc, argv, "cin:rtT:")) != EOF) {
+ while ((i = getopt(argc, argv, "cin:rtT:")) != -1) {
switch (i) {
case 'c':
try_color = TRUE;
CATCHALL(SIG_IGN);
break;
case 'n':
- if ((MAXLINES = atoi(optarg)) < 1)
+ if ((MAXLINES = atoi(optarg)) < 1 ||
+ (MAXLINES + 2) <= 1)
usage();
break;
#if CAN_RESIZE
lptr++;
else
break;
- wscrl(stdscr, lptr - olptr);
+ scrl(lptr - olptr);
break;
case KEY_UP:
lptr--;
else
break;
- wscrl(stdscr, lptr - olptr);
+ scrl(lptr - olptr);
break;
case 'h':
time_t this_time;
#if CAN_RESIZE
- sprintf(temp, "%s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
+ sprintf(temp, "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
i = strlen(temp);
- sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
+ if ((i + 7) < (int) sizeof(temp))
+ sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
#else
+ (void) tag;
sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname);
#endif
move(0, 0);