less verbose...

[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 d9cd975..1e9c188 100644 (file)
--- a/usr/src/usr.bin/window/main.c
+++ b/usr/src/usr.bin/window/main.c
@@ -1,10 +1,30 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)main.c      3.16 84/03/23";
-#endif
+static char sccsid[] = "@(#)main.c     3.34 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "defs.h"
 #include <sys/signal.h>
 #include <stdio.h>
 
 #include "defs.h"
 #include <sys/signal.h>
 #include <stdio.h>

+#include "string.h"
+#include "char.h"
+#include "local.h"

 
 #define next(a) (*++*(a) ? *(a) : (*++(a) ? *(a) : (char *)usage()))
 
 
 #define next(a) (*++*(a) ? *(a) : (*++(a) ? *(a) : (char *)usage()))
 


@@ -16,7 +36,10 @@ char **argv;
        char fflag = 0;
        char dflag = 0;
        char xflag = 0;
        char fflag = 0;
        char dflag = 0;
        char xflag = 0;

+       char *cmd = 0;
+       char tflag = 0;

 
 

+       escapec = ESCAPEC;      

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


@@ -28,11 +51,19 @@ char **argv;
                        case 'f':
                                fflag++;
                                break;
                        case 'f':
                                fflag++;
                                break;

+                       case 'c':
+                               if (cmd != 0) {
+                                       (void) fprintf(stderr,
+                                               "Only one -c allowed.\n");
+                                       (void) usage();
+                               }
+                               cmd = next(argv);
+                               break;

                        case 'e':
                                setescape(next(argv));
                                break;
                        case 't':
                        case 'e':
                                setescape(next(argv));
                                break;
                        case 't':

-                               terse++;
+                               tflag++;

                                break;
                        case 'd':
                                dflag++;
                                break;
                        case 'd':
                                dflag++;


@@ -49,17 +80,19 @@ char **argv;
                } else
                        (void) usage();
        }
                } else
                        (void) usage();
        }

-       nbufline = 48;                          /* compatible */
-       escapec = CTRL(p);      
-       if ((shell = getenv("SHELL")) == 0)
-               shell = "/bin/csh";
-       if (shellname = rindex(shell, '/'))
-               shellname++;
+       if ((p = getenv("SHELL")) == 0)
+               p = SHELL;
+       if ((default_shellfile = str_cpy(p)) == 0)
+               nomem();
+       if (p = rindex(default_shellfile, '/'))
+               p++;

        else
        else

-               shellname = shell;
-#ifndef O_4_1A
+               p = default_shellfile;
+       default_shell[0] = p;
+       default_shell[1] = 0;
+       default_nline = NLINE;
+       default_smooth = 1;

        (void) gettimeofday(&starttime, (struct timezone *)0);
        (void) gettimeofday(&starttime, (struct timezone *)0);

-#endif

        if (wwinit() < 0) {
                (void) fprintf(stderr, "%s.\n", wwerror());
                exit(1);
        if (wwinit() < 0) {
                (void) fprintf(stderr, "%s.\n", wwerror());
                exit(1);


@@ -71,14 +104,18 @@ char **argv;
                wwnewtty.ww_tchars.t_startc = wwoldtty.ww_tchars.t_startc;
        }
        if (debug || xflag)
                wwnewtty.ww_tchars.t_startc = wwoldtty.ww_tchars.t_startc;
        }
        if (debug || xflag)

-               (void) wwsettty(0, &wwnewtty);
+               (void) wwsettty(0, &wwnewtty, &wwoldtty);

 
 

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

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

+       cmdwin->ww_mapnl = 1;

        cmdwin->ww_nointr = 1;
        cmdwin->ww_nointr = 1;

+       cmdwin->ww_noupdate = 1;
+       cmdwin->ww_unctrl = 1;

        if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))
            == 0) {
                (void) wwflush();
        if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))
            == 0) {
                (void) wwflush();


@@ -91,32 +128,25 @@ char **argv;
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }

+       fgwin = framewin;

 
        wwupdate();
        wwflush();
        (void) signal(SIGCHLD, wwchild);
        setvars();
 
        wwupdate();
        wwflush();
        (void) signal(SIGCHLD, wwchild);
        setvars();

-       if (fflag)
-               wwcurwin = 0;
-       else {
-               if (!terse)
-                       wwadd(cmdwin, &wwhead);
+
+       setterse(tflag);
+       setcmd(1);
+       if (cmd != 0)
+               (void) dolongcmd(cmd, (struct value *)0, 0);
+       if (!fflag)

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

-               if (selwin != 0) {
-                       wwcurwin = selwin;
-                       wwcursor(selwin, 0);
-               }
-               if (!terse) {
-                       wwdelete(cmdwin);
-                       reframe();
-               }
-       }
+       if (selwin != 0)
+               setcmd(0);

 
        mloop();
 
 
        mloop();
 

-       wwupdate();
-       wwflush();

 bad:
        wwend();
        return 0;
 bad:
        wwend();
        return 0;


@@ -124,7 +154,13 @@ bad:
 
 usage()
 {
 
 usage()
 {

-       (void) fprintf(stderr, "window: [-e escape-char] [-t] [-f] [-d]\n");
+       (void) fprintf(stderr, "Usage: window [-e escape-char] [-c command] [-t] [-f] [-d]\n");

        exit(1);
        return 0;                       /* for lint */
 }
        exit(1);
        return 0;                       /* for lint */
 }

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