X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fditto.c;h=387f7077f757303fccce7f27aa3b100616b620ea;hp=06cdcc66c3b61143b6051859b7e6a5317d3f7c9c;hb=c04d54322f7835ed42e597967d8fa5471025fcac;hpb=1078c0231b8a58fbd2dd56b6e0a81b19d6b07f77

diff --git a/test/ditto.c b/test/ditto.c
index 06cdcc66..387f7077 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.28 2008/06/07 22:35:58 tom Exp $
+ * $Id: ditto.c,v 1.35 2009/10/24 21:33:24 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -43,8 +43,6 @@
  */
 #include <test.priv.h>
 #include <sys/stat.h>
-#include <errno.h>
-#undef USE_PTHREADS
 
 #ifdef USE_PTHREADS
 #include <pthread.h>
@@ -138,8 +136,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;
 }
@@ -152,10 +150,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;
@@ -167,6 +166,8 @@ open_tty(char *path)
 	_exit(0);
     }
     fp = fdopen(amaster, "r+");
+    if (fp == 0)
+	failed(path);
 #else
     struct stat sb;
 
@@ -181,11 +182,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;
@@ -196,8 +202,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);
@@ -234,6 +240,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);
@@ -245,9 +252,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();
 }
@@ -256,7 +269,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]);
@@ -275,7 +292,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]);
@@ -291,7 +312,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);
 	}
     }
@@ -319,12 +340,27 @@ handle_screen(void *arg)
     DDATA ddata;
     int ch;
 
+    memset(&ddata, 0, sizeof(ddata));
     ddata.ditto = (DITTO *) arg;
     ddata.source = ddata.ditto->which1;
+    ddata.ditto -= ddata.source;	/* -> base of array */
+
     for (;;) {
 	ch = read_screen(ddata.ditto->screen, &ddata);
-	if (ch == CTRL('D'))
+	if (ch == CTRL('D')) {
+	    int later = (ddata.source ? ddata.source : -1);
+	    int j;
+
+	    for (j = ddata.ditto->length - 1; j > 0; --j) {
+		if (j != later) {
+		    pthread_cancel(ddata.ditto[j].thread);
+		}
+	    }
+	    if (later > 0) {
+		pthread_cancel(ddata.ditto[later].thread);
+	    }
 	    break;
+	}
 	show_ditto(ddata.ditto, ddata.ditto->length, &ddata);
     }
     return NULL;
@@ -343,7 +379,7 @@ 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++) {
@@ -359,6 +395,7 @@ main(int argc, char *argv[])
     for (j = 0; j < argc; j++) {
 	(void) pthread_create(&(data[j].thread), NULL, handle_screen, &data[j]);
     }
+    pthread_join(data[1].thread, NULL);
 #else
     /*
      * Loop, reading characters from any of the inputs and writing to all