/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2011 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 *
/*
* 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.41 2011/05/21 18:55:07 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>
DITTO *ditto; /* data for all screens */
} DDATA;
+static void failed(const char *) GCC_NORETURN;
+static void usage(void) GCC_NORETURN;
+
static void
failed(const char *s)
{
{
int result = -1;
if (peek->sequence < fifo->sequence) {
- peek->sequence += 1;
result = fifo->data[THIS_FIFO(peek->sequence)];
+ peek->sequence += 1;
}
return result;
}
int amaster;
int aslave;
char slave_name[1024];
- char s_option[1024];
- char *leaf;
+ char s_option[sizeof(slave_name) + 80];
- 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) {
+ if (strrchr(slave_name, '/') == 0) {
errno = EISDIR;
failed(slave_name);
}
_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;
}
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;
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);
WINDOW *inner = derwin(outer, high - 2, wide - 2, 1, 1);
box(outer, 0, 0);
- mvwaddstr(outer, 0, 2, target->titles[k]);
+ MvWAddStr(outer, 0, 2, target->titles[k]);
wnoutrefresh(outer);
scrollok(inner, TRUE);
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);
}
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();
}
* 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]);
* 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]);
while ((ch = peek_fifo(fifo, peek)) > 0) {
changed = TRUE;
- waddch(win, ch);
+ waddch(win, (chtype) ch);
wnoutrefresh(win);
}
}
{
int n;
+ (void) data;
for (n = 0; n < count; n++) {
ddata->target = n;
USING_SCREEN(data[n].screen, write_screen, (void *) ddata);
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");
+ assert(data != 0);
+
for (j = 0; j < argc; j++) {
open_screen(&data[j], argv, 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