gratuitous stylistic change

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

diff --git a/usr/src/usr.bin/window/startup.c b/usr/src/usr.bin/window/startup.c
index f9153d4..a26cc32 100644 (file)
--- a/usr/src/usr.bin/window/startup.c
+++ b/usr/src/usr.bin/window/startup.c
@@ -1,44 +1,59 @@
+/*
+ * Copyright (c) 1983 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.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)startup.c   3.11 84/04/09";
-#endif
+static char sccsid[] = "@(#)startup.c  3.22 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "defs.h"
 #include "value.h"
 #include "var.h"
 #include "char.h"
 
 #include "defs.h"
 #include "value.h"
 #include "var.h"
 #include "char.h"

+#include "local.h"

 
 doconfig()
 {
        char buf[100];
        char *home;
 
 doconfig()
 {
        char buf[100];
        char *home;

-       static char runcom[] = ".windrc";
+       static char runcom[] = RUNCOM;

 
        if ((home = getenv("HOME")) == 0)
                home = ".";
 
        if ((home = getenv("HOME")) == 0)
                home = ".";

-       return dosource(sprintf(buf, "%.*s/.windrc",
+       sprintf(buf, "%.*s/%s",

                (sizeof buf - sizeof runcom) / sizeof (char) - 1,
                (sizeof buf - sizeof runcom) / sizeof (char) - 1,

-               home, runcom));
+               home, runcom);
+       return dosource(buf);

 }
 
 /*
 }
 
 /*

- * The default is two windows of equal sizes.
+ * The default is two windows of equal size.

  */
 dodefault()
 {
        struct ww *w;
        register r = wwnrow / 2 - 1;
 
  */
 dodefault()
 {
        struct ww *w;
        register r = wwnrow / 2 - 1;
 

-       if ((w = openwin(-1, 1, 0, r, wwncol, nbufline,
-                               (char *) 0, 1, 1, shellfile, shell)) == 0)
-               goto bad;
-       if (openwin(-1, r + 2, 0, wwnrow - r - 2, wwncol, nbufline,
-                               (char *) 0, 1, 1, shellfile, shell) == 0)
-               goto bad;
+       if (openwin(1, r + 2, 0, wwnrow - r - 2, wwncol, default_nline,
+               (char *) 0, 1, 1, default_shellfile, default_shell) == 0)
+               return;
+       if ((w = openwin(0, 1, 0, r, wwncol, default_nline,
+               (char *) 0, 1, 1, default_shellfile, default_shell)) == 0)
+               return;

        wwprintf(w, "Escape character is %s.\r\n", unctrl(escapec));
        wwprintf(w, "Escape character is %s.\r\n", unctrl(escapec));

-       setselwin(w);
-       return;
-bad:
-       error("Can't open default windows.");

 }
 
 setvars()
 }
 
 setvars()


@@ -51,6 +66,8 @@ setvars()
        (void) var_setnum("m_blk", WWM_BLK);
        (void) var_setnum("m_ul", WWM_UL);
        (void) var_setnum("m_grp", WWM_GRP);
        (void) var_setnum("m_blk", WWM_BLK);
        (void) var_setnum("m_ul", WWM_UL);
        (void) var_setnum("m_grp", WWM_GRP);

+       (void) var_setnum("m_dim", WWM_DIM);
+       (void) var_setnum("m_usr", WWM_USR);

        (void) var_setstr("term", wwterm);
        (void) var_setnum("modes", wwavailmodes);
 }
        (void) var_setstr("term", wwterm);
        (void) var_setnum("modes", wwavailmodes);
 }