close all special case added to l_close()

SCCS-vsn: usr.bin/window/cmd3.c 3.3
SCCS-vsn: usr.bin/window/lcmd.c 3.4
SCCS-vsn: usr.bin/window/lcmd1.c 3.4

diff --git a/usr/src/usr.bin/window/cmd3.c b/usr/src/usr.bin/window/cmd3.c
index b15abb6..a98571e 100644 (file)
--- a/usr/src/usr.bin/window/cmd3.c
+++ b/usr/src/usr.bin/window/cmd3.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd3.c      3.2 83/08/15";
+static char *sccsid = "@(#)cmd3.c      3.3 83/08/22";

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


@@ -17,7 +17,7 @@ register struct ww *w;
                for (i = 0; i < NWINDOW; i++) {
                        if ((w = window[i]) == 0)
                                continue;
                for (i = 0; i < NWINDOW; i++) {
                        if ((w = window[i]) == 0)
                                continue;

-                       closewin(w);            /* GROT */
+                       closewin(w);

                        didit++;
                }
        }
                        didit++;
                }
        }

diff --git a/usr/src/usr.bin/window/lcmd.c b/usr/src/usr.bin/window/lcmd.c
index c176502..55534eb 100644 (file)
--- a/usr/src/usr.bin/window/lcmd.c
+++ b/usr/src/usr.bin/window/lcmd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)lcmd.c      3.3 83/08/12";
+static char *sccsid = "@(#)lcmd.c      3.4 83/08/22";

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


@@ -23,7 +23,7 @@ struct lcmd {
 };
 static struct lcmd lcmd[] = {
        "%",            1, 1, 0,  0, l_select,
 };
 static struct lcmd lcmd[] = {
        "%",            1, 1, 0,  0, l_select,

-       "close",        1, 0, 1, -1, l_close,
+       "close",        1, 0, 0, -1, l_close,

        "escape",       1, 0, 1,  1, l_escape,
        "label",        1, 0, 2,  2, l_label,
        "source",       1, 0, 1,  1, l_source,
        "escape",       1, 0, 1,  1, l_escape,
        "label",        1, 0, 2,  2, l_label,
        "source",       1, 0, 1,  1, l_source,

diff --git a/usr/src/usr.bin/window/lcmd1.c b/usr/src/usr.bin/window/lcmd1.c
index 7c1802c..969bbee 100644 (file)
--- a/usr/src/usr.bin/window/lcmd1.c
+++ b/usr/src/usr.bin/window/lcmd1.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)lcmd1.c     3.3 83/08/12";
+static char *sccsid = "@(#)lcmd1.c     3.4 83/08/22";

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


@@ -106,6 +106,10 @@ l_close()
        register struct ww *w;
        char didit = 0;
 
        register struct ww *w;
        char didit = 0;
 

+       if (argc < 2) {
+               c_close((struct ww *)0);
+               return;
+       }

        for (i = 1; i < argc; i++) {
                if ((w = idtowin(argv[i])) == 0)
                        continue;
        for (i = 1; i < argc; i++) {
                if ((w = idtowin(argv[i])) == 0)
                        continue;