BSD 4_4 release

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

diff --git a/usr/src/usr.bin/window/lcmd1.c b/usr/src/usr.bin/window/lcmd1.c
index 9b8c437..ff96cac 100644 (file)
--- a/usr/src/usr.bin/window/lcmd1.c
+++ b/usr/src/usr.bin/window/lcmd1.c
@@ -1,17 +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 this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * 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[] = "@(#)lcmd1.c    3.32 (Berkeley) %G%";
+static char sccsid[] = "@(#)lcmd1.c    8.1 (Berkeley) 6/6/93";

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


@@ -45,7 +69,7 @@ register struct value *a;
        char *label;
        char haspty, hasframe, mapnl, keepopen, smooth;
        char *shf, **sh;
        char *label;
        char haspty, hasframe, mapnl, keepopen, smooth;
        char *shf, **sh;

-       char *argv[sizeof shell / sizeof *shell];
+       char *argv[sizeof default_shell / sizeof *default_shell];

        register char **pp;
 
        if ((id = findid()) < 0)
        register char **pp;
 
        if ((id = findid()) < 0)


@@ -58,7 +82,7 @@ register struct value *a;
        a++;
        ncol = a->v_type == V_ERR ? wwncol - col : a->v_num;
        a++;
        a++;
        ncol = a->v_type == V_ERR ? wwncol - col : a->v_num;
        a++;

-       nline = a->v_type == V_ERR ? nbufline : a->v_num;
+       nline = a->v_type == V_ERR ? default_nline : a->v_num;

        a++;
        label = a->v_type == V_ERR ? 0 : a->v_str;
        if ((haspty = vtobool(++a, 1, -1)) < 0)
        a++;
        label = a->v_type == V_ERR ? 0 : a->v_str;
        if ((haspty = vtobool(++a, 1, -1)) < 0)


@@ -69,7 +93,7 @@ register struct value *a;
                return;
        if ((keepopen = vtobool(++a, 0, -1)) < 0)
                return;
                return;
        if ((keepopen = vtobool(++a, 0, -1)) < 0)
                return;

-       if ((smooth = vtobool(++a, 1, -1)) < 0)
+       if ((smooth = vtobool(++a, default_smooth, -1)) < 0)

                return;
        if ((++a)->v_type != V_ERR) {
                for (pp = argv; a->v_type != V_ERR &&
                return;
        if ((++a)->v_type != V_ERR) {
                for (pp = argv; a->v_type != V_ERR &&


@@ -82,8 +106,8 @@ register struct value *a;
                else
                        *sh = shf;
        } else {
                else
                        *sh = shf;
        } else {

-               sh = shell;
-               shf = shellfile;
+               sh = default_shell;
+               shf = default_shellfile;

        }
        if ((w = openwin(id, row, col, nrow, ncol, nline, label, haspty,
            hasframe, shf, sh)) == 0)
        }
        if ((w = openwin(id, row, col, nrow, ncol, nline, label, haspty,
            hasframe, shf, sh)) == 0)


@@ -95,18 +119,18 @@ register struct value *a;
        v->v_num = id + 1;
 }
 
        v->v_num = id + 1;
 }
 

-struct lcmd_arg arg_nline[] = {
+struct lcmd_arg arg_def_nline[] = {

        { "nlines",     1,      ARG_NUM },
        0
 };
 
        { "nlines",     1,      ARG_NUM },
        0
 };
 

-l_nline(v, a)
+l_def_nline(v, a)

 register struct value *v, *a;
 {
 register struct value *v, *a;
 {

-       v->v_num = nbufline;
+       v->v_num = default_nline;

        v->v_type = V_NUM;
        if (a->v_type != V_ERR)
        v->v_type = V_NUM;
        if (a->v_type != V_ERR)

-               nbufline = a->v_num;
+               default_nline = a->v_num;

 }
 
 struct lcmd_arg arg_smooth[] = {
 }
 
 struct lcmd_arg arg_smooth[] = {


@@ -128,6 +152,19 @@ register struct value *v, *a;
        w->ww_noupdate = !vtobool(a, v->v_num, v->v_num);
 }
 
        w->ww_noupdate = !vtobool(a, v->v_num, v->v_num);
 }
 

+struct lcmd_arg arg_def_smooth[] = {
+       { "flag",       1,      ARG_ANY },
+       0
+};
+
+l_def_smooth(v, a)
+register struct value *v, *a;
+{
+       v->v_type = V_NUM;
+       v->v_num = default_smooth;
+       default_smooth = vtobool(a, v->v_num, v->v_num);
+}
+

 struct lcmd_arg arg_select[] = {
        { "window",     1,      ARG_NUM },
        0
 struct lcmd_arg arg_select[] = {
        { "window",     1,      ARG_NUM },
        0