added "more" command

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

diff --git a/usr/src/usr.bin/window/wwclose.c b/usr/src/usr.bin/window/wwclose.c
index c7cf5b3..6c5bea9 100644 (file)
--- a/usr/src/usr.bin/window/wwclose.c
+++ b/usr/src/usr.bin/window/wwclose.c
@@ -1,27 +1,30 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwclose.c   1.2 83/07/19";
+static char sccsid[] = "@(#)wwclose.c  3.13 %G%";

 #endif
 
 #endif
 

+/*
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.
+ */
+

 #include "ww.h"
 #include <signal.h>
 
 wwclose(w)
 register struct ww *w;
 {
 #include "ww.h"
 #include <signal.h>
 
 wwclose(w)
 register struct ww *w;
 {

-       register struct ww **p;
-
-       for (p = &wwhead; *p && *p != w; p = &(*p)->ww_next)
-               ;
-       if (*p == 0)
-               return -1;
-       *p = w->ww_next;
-       if (curwin == w)
-               curwin = wwhead;
-       if (w->ww_state == WW_HASPROC)
-               kill(w->ww_pid, SIGHUP);
-       close(w->ww_tty);
-       close(w->ww_pty);
-       Wclose(w->ww_win);
-       cfree(w);
-       return 0;
+       wwindex[w->ww_index] = 0;
+       if (w->ww_pty >= 0)
+               (void) close(w->ww_pty);
+       if (w->ww_socket >= 0)
+               (void) close(w->ww_socket);
+       wwfree((char **)w->ww_win, w->ww_w.t);
+       wwfree((char **)w->ww_buf, w->ww_b.t);
+       if (w->ww_fmap != 0)
+               wwfree((char **)w->ww_fmap, w->ww_w.t);
+       free((char *)(w->ww_nvis + w->ww_w.t));
+       if (w->ww_ob != 0)
+               free(w->ww_ob);
+       free((char *)w);

 }
 }