removed extra tt_col += n in gen_write

[unix-history] / usr / src / usr.bin / window / wwopen.c

diff --git a/usr/src/usr.bin/window/wwopen.c b/usr/src/usr.bin/window/wwopen.c
index 09d4574..d765235 100644 (file)
--- a/usr/src/usr.bin/window/wwopen.c
+++ b/usr/src/usr.bin/window/wwopen.c
@@ -1,8 +1,16 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwopen.c    3.12 83/09/15";
+static char sccsid[] = "@(#)wwopen.c   3.21 %G%";

 #endif
 
 #endif
 

+/*
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.
+ */
+

 #include "ww.h"
 #include "ww.h"

+#include <sys/types.h>
+#include <sys/socket.h>

 
 struct ww *
 wwopen(flags, nrow, ncol, row, col, nline)
 
 struct ww *
 wwopen(flags, nrow, ncol, row, col, nline)


@@ -17,6 +25,8 @@ wwopen(flags, nrow, ncol, row, col, nline)
                wwerrno = WWE_NOMEM;
                goto bad;
        }
                wwerrno = WWE_NOMEM;
                goto bad;
        }

+       w->ww_pty = -1;
+       w->ww_socket = -1;

 
        for (i = 0; i < NWW && wwindex[i] != 0; i++)
                ;
 
        for (i = 0; i < NWW && wwindex[i] != 0; i++)
                ;


@@ -54,11 +64,36 @@ wwopen(flags, nrow, ncol, row, col, nline)
        w->ww_cur.c = w->ww_w.l;
 
        if (flags & WWO_PTY) {
        w->ww_cur.c = w->ww_w.l;
 
        if (flags & WWO_PTY) {

+               struct winsize winsize;
+

                if (wwgetpty(w) < 0)
                        goto bad;
                if (wwgetpty(w) < 0)
                        goto bad;

-               w->ww_haspty = 1;
-               if (wwsettty(w->ww_pty, &wwwintty) < 0)
+               if (wwsettty(w->ww_pty, &wwwintty, (struct ww_tty *)0) < 0)
+                       goto bad;
+               winsize.ws_row = nrow;
+               winsize.ws_col = ncol;
+               winsize.ws_xpixel = winsize.ws_ypixel = 0;
+               if (ioctl(w->ww_pty, (int)TIOCSWINSZ, (char *)&winsize) < 0) {
+                       wwerrno = WWE_SYS;
+                       goto bad;
+               }
+               w->ww_ispty = 1;
+       } else if (flags & WWO_SOCKET) {
+               int d[2];
+               if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, d) < 0) {
+                       wwerrno = WWE_SYS;
+                       goto bad;
+               }
+               w->ww_pty = d[0];
+               w->ww_socket = d[1];
+       }
+       if (flags & (WWO_PTY|WWO_SOCKET)) {
+               if ((w->ww_ob = malloc(512)) == 0) {
+                       wwerrno = WWE_NOMEM;

                        goto bad;
                        goto bad;

+               }
+               w->ww_obe = w->ww_ob + 512;
+               w->ww_obp = w->ww_obq = w->ww_ob;

        }
 
        w->ww_win = wwalloc(w->ww_w.t, w->ww_w.l,
        }
 
        w->ww_win = wwalloc(w->ww_w.t, w->ww_w.l,


@@ -73,25 +108,17 @@ wwopen(flags, nrow, ncol, row, col, nline)
        for (i = w->ww_w.t; i < w->ww_w.b; i++)
                for (j = w->ww_w.l; j < w->ww_w.r; j++)
                        w->ww_win[i][j] = m;
        for (i = w->ww_w.t; i < w->ww_w.b; i++)
                for (j = w->ww_w.l; j < w->ww_w.r; j++)
                        w->ww_win[i][j] = m;

-       
-       w->ww_cov = wwalloc(w->ww_w.t, w->ww_w.l,
-               w->ww_w.nr, w->ww_w.nc, sizeof (char));
-       if (w->ww_cov == 0)
-               goto bad;
-       for (i = w->ww_w.t; i < w->ww_w.b; i++)
-               for (j = w->ww_w.l; j < w->ww_w.r; j++)
-                       w->ww_cov[i][j] = WWX_NOBODY;

 
        if (flags & WWO_FRAME) {
                w->ww_fmap = wwalloc(w->ww_w.t, w->ww_w.l,
                        w->ww_w.nr, w->ww_w.nc, sizeof (char));
                if (w->ww_fmap == 0)
 
        if (flags & WWO_FRAME) {
                w->ww_fmap = wwalloc(w->ww_w.t, w->ww_w.l,
                        w->ww_w.nr, w->ww_w.nc, sizeof (char));
                if (w->ww_fmap == 0)

-                       wwerrno = WWE_NOMEM;
+                       goto bad;

                for (i = w->ww_w.t; i < w->ww_w.b; i++)
                        for (j = w->ww_w.l; j < w->ww_w.r; j++)
                                w->ww_fmap[i][j] = 0;
        }
                for (i = w->ww_w.t; i < w->ww_w.b; i++)
                        for (j = w->ww_w.l; j < w->ww_w.r; j++)
                                w->ww_fmap[i][j] = 0;
        }

-       
+

        w->ww_buf = (union ww_char **)
                wwalloc(w->ww_b.t, w->ww_b.l,
                        w->ww_b.nr, w->ww_b.nc, sizeof (union ww_char));
        w->ww_buf = (union ww_char **)
                wwalloc(w->ww_b.t, w->ww_b.l,
                        w->ww_b.nr, w->ww_b.nc, sizeof (union ww_char));


@@ -112,23 +139,24 @@ wwopen(flags, nrow, ncol, row, col, nline)
                w->ww_nvis[i] = nvis;
 
        w->ww_state = WWS_INITIAL;
                w->ww_nvis[i] = nvis;
 
        w->ww_state = WWS_INITIAL;

+       w->ww_oflags = flags;

        return wwindex[w->ww_index] = w;
 bad:
        if (w != 0) {
                if (w->ww_win != 0)
                        wwfree(w->ww_win, w->ww_w.t);
        return wwindex[w->ww_index] = w;
 bad:
        if (w != 0) {
                if (w->ww_win != 0)
                        wwfree(w->ww_win, w->ww_w.t);

-               if (w->ww_cov != 0)
-                       wwfree(w->ww_cov, w->ww_w.t);

                if (w->ww_fmap != 0)
                        wwfree(w->ww_fmap, w->ww_w.t);
                if (w->ww_buf != 0)
                        wwfree((char **)w->ww_buf, w->ww_b.t);
                if (w->ww_nvis != 0)
                        free((char *)(w->ww_nvis + w->ww_w.t));
                if (w->ww_fmap != 0)
                        wwfree(w->ww_fmap, w->ww_w.t);
                if (w->ww_buf != 0)
                        wwfree((char **)w->ww_buf, w->ww_b.t);
                if (w->ww_nvis != 0)
                        free((char *)(w->ww_nvis + w->ww_w.t));

-               if (w->ww_haspty) {
-                       (void) close(w->ww_tty);
+               if (w->ww_ob != 0)
+                       free(w->ww_ob);
+               if (w->ww_pty >= 0)

                        (void) close(w->ww_pty);
                        (void) close(w->ww_pty);

-               }
+               if (w->ww_socket >= 0)
+                       (void) close(w->ww_socket);

                free((char *)w);
        }
        return 0;
                free((char *)w);
        }
        return 0;