X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fditto.c;h=93fbe02805cb91cf1a3c06ca9005ec1550d25a31;hp=9d1116c279eaa1e8e38802b1b17b4b0402fa72ae;hb=8fc9fa113b27e0749e0840fef04c9d4acad4aae7;hpb=4e6cadb948fd73686614442733848fe271e5d7b2

diff --git a/test/ditto.c b/test/ditto.c
index 9d1116c2..93fbe028 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.30 2008/06/14 23:00:26 tom Exp $
+ * $Id: ditto.c,v 1.34 2009/07/17 00:07:25 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -137,8 +137,8 @@ peek_fifo(FIFO * fifo, PEEK * peek)
 {
     int result = -1;
     if (peek->sequence < fifo->sequence) {
-	peek->sequence += 1;
 	result = fifo->data[THIS_FIFO(peek->sequence)];
+	peek->sequence += 1;
     }
     return result;
 }
@@ -151,10 +151,11 @@ open_tty(char *path)
     int amaster;
     int aslave;
     char slave_name[1024];
-    char s_option[1024];
+    char s_option[sizeof(slave_name) + 80];
     char *leaf;
 
-    if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0)
+    if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
+	|| strlen(slave_name) > sizeof(slave_name) - 1)
 	failed("openpty");
     if ((leaf = strrchr(slave_name, '/')) == 0) {
 	errno = EISDIR;
@@ -166,6 +167,8 @@ open_tty(char *path)
 	_exit(0);
     }
     fp = fdopen(amaster, "r+");
+    if (fp == 0)
+	failed(path);
 #else
     struct stat sb;
 
@@ -180,11 +183,16 @@ open_tty(char *path)
 	failed(path);
     printf("opened %s\n", path);
 #endif
+    assert(fp != 0);
     return fp;
 }
 
 static void
-init_screen(SCREEN *sp GCC_UNUSED, void *arg)
+init_screen(
+#if HAVE_USE_WINDOW
+	       SCREEN *sp GCC_UNUSED,
+#endif
+	       void *arg)
 {
     DITTO *target = (DITTO *) arg;
     int high, wide;
@@ -195,8 +203,8 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg)
     scrollok(stdscr, TRUE);
     box(stdscr, 0, 0);
 
-    target->windows = typeCalloc(WINDOW *, target->length);
-    target->peeks = typeCalloc(PEEK, target->length);
+    target->windows = typeCalloc(WINDOW *, (size_t) target->length);
+    target->peeks = typeCalloc(PEEK, (size_t) target->length);
 
     high = (LINES - 2) / target->length;
     wide = (COLS - 2);
@@ -233,6 +241,7 @@ open_screen(DITTO * target, char **source, int length, int which1)
     target->which1 = which1;
     target->titles = source;
     target->length = length;
+    target->fifo.head = -1;
     target->screen = newterm((char *) 0,	/* assume $TERM is the same */
 			     target->output,
 			     target->input);
@@ -244,9 +253,15 @@ open_screen(DITTO * target, char **source, int length, int which1)
 }
 
 static int
-close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
+close_screen(
+#if HAVE_USE_WINDOW
+		SCREEN *sp GCC_UNUSED,
+#endif
+		void *arg GCC_UNUSED)
 {
+#if HAVE_USE_WINDOW
     (void) sp;
+#endif
     (void) arg;
     return endwin();
 }
@@ -255,7 +270,11 @@ close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
  * Read data from the 'source' screen.
  */
 static int
-read_screen(SCREEN *sp GCC_UNUSED, void *arg)
+read_screen(
+#if HAVE_USE_WINDOW
+	       SCREEN *sp GCC_UNUSED,
+#endif
+	       void *arg)
 {
     DDATA *data = (DDATA *) arg;
     DITTO *ditto = &(data->ditto[data->source]);
@@ -274,7 +293,11 @@ read_screen(SCREEN *sp GCC_UNUSED, void *arg)
  * Write all of the data that's in fifos for the 'target' screen.
  */
 static int
-write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
+write_screen(
+#if HAVE_USE_WINDOW
+		SCREEN *sp GCC_UNUSED,
+#endif
+		void *arg GCC_UNUSED)
 {
     DDATA *data = (DDATA *) arg;
     DITTO *ditto = &(data->ditto[data->target]);
@@ -290,7 +313,7 @@ write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
 	while ((ch = peek_fifo(fifo, peek)) > 0) {
 	    changed = TRUE;
 
-	    waddch(win, ch);
+	    waddch(win, (chtype) ch);
 	    wnoutrefresh(win);
 	}
     }
@@ -356,8 +379,8 @@ main(int argc, char *argv[])
 
     if (argc <= 1)
 	usage();
-
-    if ((data = typeCalloc(DITTO, argc)) == 0)
+    
+    if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
 	failed("calloc data");
 
     for (j = 0; j < argc; j++) {