ncurses 5.7 - patch 20090214

[ncurses.git] / test / ditto.c

diff --git a/test/ditto.c b/test/ditto.c
index 06cdcc66c3b61143b6051859b7e6a5317d3f7c9c..b8aebac93c5678f28f94604b4354e52006bfe3c4 100644 (file)
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -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.32 2008/08/04 13:21:41 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -44,7 +44,6 @@
 #include <test.priv.h>
 #include <sys/stat.h>
 #include <errno.h>
-#undef USE_PTHREADS
 
 #ifdef USE_PTHREADS
 #include <pthread.h>
@@ -152,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;
@@ -167,6 +167,8 @@ open_tty(char *path)
        _exit(0);
     }
     fp = fdopen(amaster, "r+");
+    if (fp == 0)
+       failed(path);
 #else
     struct stat sb;
 
@@ -181,6 +183,7 @@ open_tty(char *path)
        failed(path);
     printf("opened %s\n", path);
 #endif
+    assert(fp != 0);
     return fp;
 }
 
@@ -196,8 +199,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);
@@ -291,7 +294,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 +322,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 +361,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 +377,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