BSD 4_4_Lite1 release

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

diff --git a/usr/src/usr.bin/window/main.c b/usr/src/usr.bin/window/main.c
index 5674e80..15de840 100644 (file)
--- a/usr/src/usr.bin/window/main.c
+++ b/usr/src/usr.bin/window/main.c
@@ -1,9 +1,51 @@
+/*
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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, 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 = "@(#)main.c      3.24 84/04/16";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 4/2/94";
+#endif /* not lint */

 
 #include "defs.h"
 
 #include "defs.h"

-#include <sys/signal.h>
+#include <paths.h>

 #include <stdio.h>
 #include "string.h"
 #include "char.h"
 #include <stdio.h>
 #include "string.h"
 #include "char.h"


@@ -22,6 +64,7 @@ char **argv;
        char *cmd = 0;
        char tflag = 0;
 
        char *cmd = 0;
        char tflag = 0;
 

+       escapec = ESCAPEC;      

        if (p = rindex(*argv, '/'))
                p++;
        else
        if (p = rindex(*argv, '/'))
                p++;
        else


@@ -62,34 +105,53 @@ char **argv;
                } else
                        (void) usage();
        }
                } else
                        (void) usage();
        }

-       nbufline = NLINE;
-       escapec = ESCAPEC;      

        if ((p = getenv("SHELL")) == 0)
        if ((p = getenv("SHELL")) == 0)

-               p = SHELL;
-       if ((shellfile = str_cpy(p)) == 0)
-               nomem();
-       if (p = rindex(shellfile, '/'))
+               p = _PATH_BSHELL;
+       if ((default_shellfile = str_cpy(p)) == 0) {
+               (void) fprintf(stderr, "Out of memory.\n");
+               exit(1);
+       }
+       if (p = rindex(default_shellfile, '/'))

                p++;
        else
                p++;
        else

-               p = shellfile;
-       shell[0] = p;
-       shell[1] = 0;
+               p = default_shellfile;
+       default_shell[0] = p;
+       default_shell[1] = 0;
+       default_nline = NLINE;
+       default_smooth = 1;

        (void) gettimeofday(&starttime, (struct timezone *)0);
        if (wwinit() < 0) {
                (void) fprintf(stderr, "%s.\n", wwerror());
                exit(1);
        }
        (void) gettimeofday(&starttime, (struct timezone *)0);
        if (wwinit() < 0) {
                (void) fprintf(stderr, "%s.\n", wwerror());
                exit(1);
        }

+
+#ifdef OLD_TTY

        if (debug)
                wwnewtty.ww_tchars.t_quitc = wwoldtty.ww_tchars.t_quitc;
        if (xflag) {
                wwnewtty.ww_tchars.t_stopc = wwoldtty.ww_tchars.t_stopc;
                wwnewtty.ww_tchars.t_startc = wwoldtty.ww_tchars.t_startc;
        }
        if (debug)
                wwnewtty.ww_tchars.t_quitc = wwoldtty.ww_tchars.t_quitc;
        if (xflag) {
                wwnewtty.ww_tchars.t_stopc = wwoldtty.ww_tchars.t_stopc;
                wwnewtty.ww_tchars.t_startc = wwoldtty.ww_tchars.t_startc;
        }

+#else
+       if (debug) {
+               wwnewtty.ww_termios.c_cc[VQUIT] =
+                       wwoldtty.ww_termios.c_cc[VQUIT];
+               wwnewtty.ww_termios.c_lflag |= ISIG;
+       }
+       if (xflag) {
+               wwnewtty.ww_termios.c_cc[VSTOP] =
+                       wwoldtty.ww_termios.c_cc[VSTOP];
+               wwnewtty.ww_termios.c_cc[VSTART] =
+                       wwoldtty.ww_termios.c_cc[VSTART];
+               wwnewtty.ww_termios.c_iflag |= IXON;
+       }
+#endif

        if (debug || xflag)
                (void) wwsettty(0, &wwnewtty);
 
        if (debug || xflag)
                (void) wwsettty(0, &wwnewtty);
 

-       if ((cmdwin = wwopen(WWO_REVERSE, 1, wwncol, 0, 0, 0)) == 0) {
-               (void) wwflush();
+       if ((cmdwin = wwopen(wwbaud > 2400 ? WWO_REVERSE : 0, 1, wwncol,
+                            0, 0, 0)) == 0) {
+               wwflush();

                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }


@@ -99,13 +161,13 @@ char **argv;
        cmdwin->ww_unctrl = 1;
        if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))
            == 0) {
        cmdwin->ww_unctrl = 1;
        if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))
            == 0) {

-               (void) wwflush();
+               wwflush();

                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }
        wwadd(framewin, &wwhead);
        if ((boxwin = wwopen(WWO_GLASS, wwnrow, wwncol, 0, 0, 0)) == 0) {
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }
        wwadd(framewin, &wwhead);
        if ((boxwin = wwopen(WWO_GLASS, wwnrow, wwncol, 0, 0, 0)) == 0) {

-               (void) wwflush();
+               wwflush();

                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }


@@ -113,26 +175,22 @@ char **argv;
 
        wwupdate();
        wwflush();
 
        wwupdate();
        wwflush();

-       (void) signal(SIGCHLD, wwchild);

        setvars();
 
        setterse(tflag);
        setcmd(1);
        if (cmd != 0)
        setvars();
 
        setterse(tflag);
        setcmd(1);
        if (cmd != 0)

-               (void) dolongcmd(cmd);
-       if (!fflag) {
+               (void) dolongcmd(cmd, (struct value *)0, 0);
+       if (!fflag)

                if (dflag || doconfig() < 0)
                        dodefault();
                if (dflag || doconfig() < 0)
                        dodefault();

-               if (selwin != 0)
-                       setcmd(0);
-       }
+       if (selwin != 0)
+               setcmd(0);

 
        mloop();
 
 
        mloop();
 

-       wwupdate();
-       wwflush();

 bad:
 bad:

-       wwend();
+       wwend(1);

        return 0;
 }
 
        return 0;
 }
 


@@ -142,9 +200,3 @@ usage()
        exit(1);
        return 0;                       /* for lint */
 }
        exit(1);
        return 0;                       /* for lint */
 }

-
-nomem()
-{
-       (void) fprintf(stderr, "Out of memory.\n");
-       exit(1);
-}