BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/window/wwenviron.c b/usr/src/usr.bin/window/wwenviron.c
index 08fbe44..23cd568 100644 (file)
--- a/usr/src/usr.bin/window/wwenviron.c
+++ b/usr/src/usr.bin/window/wwenviron.c
@@ -5,27 +5,41 @@
  * This code is derived from software contributed to Berkeley by
  * Edward Wang at The University of California, Berkeley.
  *
  * This code is derived from software contributed to Berkeley by
  * Edward Wang at The University of California, Berkeley.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)wwenviron.c        3.26 (Berkeley) 6/6/90";
+static char sccsid[] = "@(#)wwenviron.c        3.27 (Berkeley) 8/12/90";

 #endif /* not lint */
 
 #include "ww.h"
 #endif /* not lint */
 
 #include "ww.h"

-#ifdef POSIX_TTY
+#if !defined(OLD_TTY) && !defined(TIOCSCTTY) && !defined(TIOCNOTTY)

 #include <sys/ioctl.h>
 #endif
 #include <sys/signal.h>
 #include <sys/ioctl.h>
 #endif
 #include <sys/signal.h>


@@ -50,16 +64,11 @@ register struct ww *wp;
        (void) close(i);
 #endif
        if ((i = wp->ww_socket) < 0) {
        (void) close(i);
 #endif
        if ((i = wp->ww_socket) < 0) {

-               struct winsize winsize;
-

                if ((i = open(wp->ww_ttyname, 2)) < 0)
                        goto bad;
                if ((i = open(wp->ww_ttyname, 2)) < 0)
                        goto bad;

-               if (wwsettty(i, &wwwintty, (struct ww_tty *)0) < 0)
+               if (wwsettty(i, &wwwintty) < 0)

                        goto bad;
                        goto bad;

-               winsize.ws_row = wp->ww_w.nr;
-               winsize.ws_col = wp->ww_w.nc;
-               winsize.ws_xpixel = winsize.ws_ypixel = 0;
-               if (ioctl(i, TIOCSWINSZ, (char *)&winsize) < 0)
+               if (wwsetttysize(i, wp->ww_w.nr, wp->ww_w.nc) < 0)

                        goto bad;
        }
        (void) dup2(i, 0);
                        goto bad;
        }
        (void) dup2(i, 0);


@@ -68,7 +77,7 @@ register struct ww *wp;
        for (i = wwdtablesize - 1; i > 2; i--)
                (void) close(i);
 #ifdef TIOCSCTTY
        for (i = wwdtablesize - 1; i > 2; i--)
                (void) close(i);
 #ifdef TIOCSCTTY

-       (void) setsid(0);
+       (void) setsid();

        (void) ioctl(0, TIOCSCTTY, 0);
 #else
        (void) ioctl(0, TIOCSPGRP, (char *)&pgrp);
        (void) ioctl(0, TIOCSCTTY, 0);
 #else
        (void) ioctl(0, TIOCSPGRP, (char *)&pgrp);