BSD 4_4 release

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

diff --git a/usr/src/usr.bin/window/lcmd.c b/usr/src/usr.bin/window/lcmd.c
index 9eb8aa3..3938aa7 100644 (file)
--- a/usr/src/usr.bin/window/lcmd.c
+++ b/usr/src/usr.bin/window/lcmd.c
@@ -1,22 +1,41 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The 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.
+ * 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[] = "@(#)lcmd.c     3.30 (Berkeley) %G%";
+static char sccsid[] = "@(#)lcmd.c     8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -67,7 +86,7 @@ extern struct lcmd_arg arg_unalias[];
 extern struct lcmd_arg arg_unset[];
 extern struct lcmd_arg arg_window[];
 extern struct lcmd_arg arg_write[];
 extern struct lcmd_arg arg_unset[];
 extern struct lcmd_arg arg_window[];
 extern struct lcmd_arg arg_write[];

-struct lcmd_arg arg_null[] = { { 0 } };
+struct lcmd_arg arg_null[1] = { { 0 } };

 
 struct lcmd_tab lcmd_tab[] = {
        "alias",                1,      l_alias,        arg_alias,
 
 struct lcmd_tab lcmd_tab[] = {
        "alias",                1,      l_alias,        arg_alias,


@@ -75,8 +94,8 @@ struct lcmd_tab lcmd_tab[] = {
        "cursormodes",          2,      l_cursormodes,  arg_cursormodes,
        "debug",                1,      l_debug,        arg_debug,
        "default_nlines",       9,      l_def_nline,    arg_def_nline,
        "cursormodes",          2,      l_cursormodes,  arg_cursormodes,
        "debug",                1,      l_debug,        arg_debug,
        "default_nlines",       9,      l_def_nline,    arg_def_nline,

-       "default_shell",        9,      l_def_shell,    arg_def_shell,
-       "default_smooth",       9,      l_def_smooth,   arg_def_smooth,
+       "default_shell",        10,     l_def_shell,    arg_def_shell,
+       "default_smooth",       10,     l_def_smooth,   arg_def_smooth,

        "echo",                 2,      l_echo,         arg_echo,
        "escape",               2,      l_escape,       arg_escape,
        "foreground",           1,      l_foreground,   arg_foreground,
        "echo",                 2,      l_echo,         arg_echo,
        "escape",               2,      l_escape,       arg_escape,
        "foreground",           1,      l_foreground,   arg_foreground,