/*
* 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.
#include <test.priv.h>
#include <sys/stat.h>
#include <errno.h>
-#undef USE_PTHREADS
#ifdef USE_PTHREADS
#include <pthread.h>
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;
_exit(0);
}
fp = fdopen(amaster, "r+");
+ if (fp == 0)
+ failed(path);
#else
struct stat sb;
failed(path);
printf("opened %s\n", path);
#endif
+ assert(fp != 0);
return fp;
}
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);
while ((ch = peek_fifo(fifo, peek)) > 0) {
changed = TRUE;
- waddch(win, ch);
+ waddch(win, (chtype) ch);
wnoutrefresh(win);
}
}
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;
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++) {
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