projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
read on closed socketpair returns eof
[unix-history] / usr / src / usr.bin / window / cmd2.c
diff --git a/usr/src/usr.bin/window/cmd2.c b/usr/src/usr.bin/window/cmd2.c
index 8efefa9..7cac446 100644 (file)
--- a/usr/src/usr.bin/window/cmd2.c
+++ b/usr/src/usr.bin/window/cmd2.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint
-static char *sccsid = "@(#)cmd2.c      3.24 84/04/05";
+static char sccsid[] = "@(#)cmd2.c     3.30 %G%";
 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"
@@ -7,18 +7,12 @@ static        char *sccsid = "@(#)cmd2.c      3.24 84/04/05";
 char *help_shortcmd[] = {
        "{1-9}   Select window {1-9} and return to conversation mode.",
        "%{1-9}  Select window {1-9} but stay in command mode.",
 char *help_shortcmd[] = {
        "{1-9}   Select window {1-9} and return to conversation mode.",
        "%{1-9}  Select window {1-9} but stay in command mode.",
-       "escape  Return to conversation mode",
-       "        and don't change the current window.",
-       "^^      Return to conversation mode",
-       "        and change to previously selected window.",
+       "escape  Return to conversation mode without changing window.",
+       "^^      Return to conversation mode and change to previous window.",
        "c{1-9}  Close window {1-9}.",
        "c{1-9}  Close window {1-9}.",
-       "C       Close all windows.",
-       "S       Show all windows in sequence.",
-       "L       List all windows with their labels.",
        "w       Open a new window.",
        "m{1-9}  Move window {1-9}.",
        "M{1-9}  Move window {1-9} to previous position.",
        "w       Open a new window.",
        "m{1-9}  Move window {1-9}.",
        "M{1-9}  Move window {1-9} to previous position.",
-       "v       List all variables.",
        "{^Y^E}  Scroll {up, down} one line",
        "{^U^D}  Scroll {up, down} half a window.",
        "{^B^F}  Scroll {up, down} a full window.",
        "{^Y^E}  Scroll {up, down} one line",
        "{^U^D}  Scroll {up, down} half a window.",
        "{^B^F}  Scroll {up, down} a full window.",
@@ -30,19 +24,27 @@ char *help_shortcmd[] = {
 };
 char *help_longcmd[] = {
        ":%{1-9}               Select window {1-9}.",
 };
 char *help_longcmd[] = {
        ":%{1-9}               Select window {1-9}.",
-       ":buffer lines         Set the default window buffer size.",
-       ":close {1-9}          Close window.",
+       ":close {1-9} . . .    Close windows.",
+       ":close all            Close all windows.",
        ":cursor modes         Set the cursor modes.",
        ":escape C             Set escape character to C.",
        ":cursor modes         Set the cursor modes.",
        ":escape C             Set escape character to C.",
+       ":foreground {1-9} [off]",
+       "                      Make {1-9} a foreground window.",
        ":label {1-9} string   Label window {1-9}.",
        ":label {1-9} string   Label window {1-9}.",
-       ":source filename      Execute commands in ``filename''.",
+       ":list                 List all windows.",
+       ":nline lines          Set the default number of lines",
+       "                      in window text buffers.",
+       ":shell string         Set default shell program to ``string.''",
+       ":source filename      Execute commands in ``filename.''",
        ":terse [off]          Turn on (or off) terse mode.",
        ":unset variable       Deallocate ``variable''.",
        ":terse [off]          Turn on (or off) terse mode.",
        ":unset variable       Deallocate ``variable''.",
-       ":window row col nrow ncol [nline label]",
+       ":variable             List all variables.",
+       ":window row col nrow ncol [nline label pty frame shell]",
        "                      Open a window at ``row'', ``col''",
        "                      of size ``nrow'', ``ncol'',",
        "                      with ``nline'', and ``label''.",
        "                      Open a window at ``row'', ``col''",
        "                      of size ``nrow'', ``ncol'',",
        "                      with ``nline'', and ``label''.",
-       ":write {1-9} string   Write ``string'' to window {1-9}.",
+       ":write {1-9} string . . .",
+       "                      Write strings to window {1-9}.",
        0
 };
 
        0
 };
 
@@ -54,8 +56,8 @@ c_help()
                error("Can't open help window: %s.", wwerror());
                return;
        }
                error("Can't open help window: %s.", wwerror());
                return;
        }
-       wwprintf(w, "The escape character is %s, which gets you into command mode.\n\n",
-               unctrl(escapec));
+       wwprintf(w, "The escape character is %c, which gets you into command mode.\n\n",
+               escapec);
        if (help_print(w, "Short commands", help_shortcmd) >= 0)
                (void) help_print(w, "Long commands", help_longcmd);
        closeiwin(w);
        if (help_print(w, "Short commands", help_shortcmd) >= 0)
                (void) help_print(w, "Long commands", help_longcmd);
        closeiwin(w);
@@ -82,138 +84,6 @@ register char **list;
        return more(w, 1) == 2 ? -1 : 0;
 }
 
        return more(w, 1) == 2 ? -1 : 0;
 }
 
-#ifndef O_4_1A
-char *strtime();
-
-c_time(flag)
-{
-       register struct ww *w;
-       struct rusage rusage;
-       struct timeval timeval;
-
-       if ((w = openiwin(6, "Timing and Resource Usage")) == 0) {
-               error("Can't open time window: %s.", wwerror());
-               return;
-       }
-
-       (void) gettimeofday(&timeval, (struct timezone *)0);
-       timeval.tv_sec -= starttime.tv_sec;
-       if ((timeval.tv_usec -= starttime.tv_usec) < 0) {
-               timeval.tv_sec--;
-               timeval.tv_usec += 1000000;
-       }
-       (void) getrusage(flag, &rusage);
-
-       wwprintf(w, "time\t\tutime\t\tstime\t\tmaxrss\tixrss\tidrss\tisrss\n");
-       wwprintf(w, "%-16s", strtime(&timeval));
-       wwprintf(w, "%-16s", strtime(&rusage.ru_utime));
-       wwprintf(w, "%-16s", strtime(&rusage.ru_stime));
-       wwprintf(w, "%D\t%D\t%D\t%D\n",
-               rusage.ru_maxrss, rusage.ru_ixrss,
-               rusage.ru_idrss, rusage.ru_isrss);
-       wwprintf(w, "minflt\tmajflt\tnswap\tinblk\toublk\tmsgsnd\tmsgrcv\tnsigs\tnvcsw\tnivcsw\n");
-       wwprintf(w, "%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\n",
-               rusage.ru_minflt, rusage.ru_majflt, rusage.ru_nswap,
-               rusage.ru_inblock, rusage.ru_oublock,
-               rusage.ru_msgsnd, rusage.ru_msgrcv, rusage.ru_nsignals,
-               rusage.ru_nvcsw, rusage.ru_nivcsw);
-
-       waitnl(w);
-       closeiwin(w);
-}
-
-char *
-strtime(t)
-register struct timeval *t;
-{
-       char fill = 0;
-       static char buf[20];
-       register char *p = buf;
-
-       if (t->tv_sec > 60*60) {
-               (void) sprintf(p, "%D:", t->tv_sec / (60*60));
-               while (*p++)
-                       ;
-               p--;
-               t->tv_sec %= 60*60;
-               fill++;
-       }
-       if (t->tv_sec > 60) {
-               (void) sprintf(p, fill ? "%02D:" : "%D:", t->tv_sec / 60);
-               while (*p++)
-                       ;
-               p--;
-               t->tv_sec %= 60;
-               fill++;
-       }
-       (void) sprintf(p, fill ? "%02D.%02d" : "%D.%02D",
-               t->tv_sec, t->tv_usec / 10000);
-       return buf;
-}
-#endif
-
-c_stat()
-{
-       register struct ww *w;
-
-       if ((w = openiwin(14, "IO Statistics")) == 0) {
-               error("Can't open statistics window: %s.", wwerror());
-               return;
-       }
-       wwprintf(w, "ttflush\twrite\terror\tzero\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\t%d\n",
-               wwnflush, wwnwr, wwnwre, wwnwrz, wwnwrc);
-       wwprintf(w, "wwwrite\tattmpt\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\n",
-               wwnwwr, wwnwwra, wwnwwrc);
-       wwprintf(w, "wwupdat\tline\tmiss\tmajor\tmiss\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\t%d\n",
-               wwnupdate, wwnupdline, wwnupdmiss, wwnmajline, wwnmajmiss);
-       wwprintf(w, "select\terror\tzero\n");
-       wwprintf(w, "%d\t%d\t%d\n",
-               wwnselect, wwnselecte, wwnselectz);
-       wwprintf(w, "read\terror\tzero\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\n",
-               wwnread, wwnreade, wwnreadz, wwnreadc);
-       wwprintf(w, "ptyread\terror\tzero\tcontrol\tdata\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\t%d\t%d\n",
-               wwnwread, wwnwreade, wwnwreadz,
-               wwnwreadp, wwnwreadd, wwnwreadc);
-       waitnl(w);
-       closeiwin(w);
-}
-
-c_list()
-{
-       register struct ww *w, *wp;
-       register i;
-       int n;
-
-       for (n = 0, i = 0; i < NWINDOW; i++)
-               if (window[i] != 0)
-                       n++;
-       if (n == 0) {
-               error("No windows.");
-               return;
-       }
-       if ((w = openiwin(n + 2, "Windows")) == 0) {
-               error("Can't open listing window: %s.", wwerror());
-               return;
-       }
-       for (i = 0; i < NWINDOW; i++) {
-               if ((wp = window[i]) == 0)
-                       continue;
-               wwprintf(w, "%c %c %-13s %-.*s\n",
-                       wp == selwin ? '*' : ' ',
-                       i + '1',
-                       wp->ww_state == WWS_HASPROC ? "" : "(No process)",
-                       wwncol - 20,
-                       wp->ww_label ? wp->ww_label : "(No label)");
-       }
-       waitnl(w);
-       closeiwin(w);
-}
-
 c_quit()
 {
        char oldterse = terse;
 c_quit()
 {
        char oldterse = terse;
@@ -227,6 +97,6 @@ c_quit()
                wwputs("Yes", cmdwin);
                quit++;
        } else
                wwputs("Yes", cmdwin);
                quit++;
        } else
-               wwputs("\r\n", cmdwin);
+               wwputc('\n', cmdwin);
        setterse(!quit && oldterse);
 }
        setterse(!quit && oldterse);
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.