fixed pathname typo

[unix-history] / usr / src / lib / libterm / termcap.c

diff --git a/usr/src/lib/libterm/termcap.c b/usr/src/lib/libterm/termcap.c
index e29f96c..61e1d11 100644 (file)
--- a/usr/src/lib/libterm/termcap.c
+++ b/usr/src/lib/libterm/termcap.c
@@ -1,12 +1,32 @@
+/*
+ * Copyright (c) 1980 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.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)termcap.c  4.2 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)termcap.c  5.4 (Berkeley) %G%";
+#endif /* not lint */

 
 #define        BUFSIZ          1024
 #define MAXHOP         32      /* max number of tc= indirections */
 
 #define        BUFSIZ          1024
 #define MAXHOP         32      /* max number of tc= indirections */

-#define        E_TERMCAP       "/etc/termcap"
+#define        PBUFSIZ         512     /* max length of filename path */
+#define        PVECSIZ         32      /* max number of names in path */

 
 #include <ctype.h>
 
 #include <ctype.h>

+#include "pathnames.h"
+

 /*
  * termcap - routines for dealing with the terminal capability data base
  *
 /*
  * termcap - routines for dealing with the terminal capability data base
  *


@@ -23,56 +43,110 @@ static char sccsid[] = "@(#)termcap.c      4.2 (Berkeley) %G%";
 
 static char *tbuf;
 static int hopcount;   /* detect infinite loops in termcap, init 0 */
 
 static char *tbuf;
 static int hopcount;   /* detect infinite loops in termcap, init 0 */

+static char pathbuf[PBUFSIZ];          /* holds raw path of filenames */
+static char *pathvec[PVECSIZ];         /* to point to names in pathbuf */
+static char **pvec;                    /* holds usable tail of path vector */

 char   *tskip();
 char   *tgetstr();
 char   *tdecode();
 char   *getenv();
 
 /*
 char   *tskip();
 char   *tgetstr();
 char   *tdecode();
 char   *getenv();
 
 /*

- * Get an entry for terminal name in buffer bp,
- * from the termcap file.  Parse is very rudimentary;
- * we just notice escaped newlines.
+ * Get an entry for terminal name in buffer bp from the termcap file.

  */
 tgetent(bp, name)
        char *bp, *name;
 {
  */
 tgetent(bp, name)
        char *bp, *name;
 {

+       register char *p;

        register char *cp;
        register int c;
        register char *cp;
        register int c;

-       register int i = 0, cnt = 0;
-       char ibuf[BUFSIZ];
-       char *cp2;
-       int tf;
+       char *term, *home, *termpath;
+       char **fname = pathvec;

 
 

+       pvec = pathvec;

        tbuf = bp;
        tbuf = bp;

-       tf = 0;
-#ifndef V6
+       p = pathbuf;

        cp = getenv("TERMCAP");
        /*
         * TERMCAP can have one of two things in it. It can be the
         * name of a file to use instead of /etc/termcap. In this
         * case it better start with a "/". Or it can be an entry to
         * use so we don't have to read the file. In this case it
        cp = getenv("TERMCAP");
        /*
         * TERMCAP can have one of two things in it. It can be the
         * name of a file to use instead of /etc/termcap. In this
         * case it better start with a "/". Or it can be an entry to
         * use so we don't have to read the file. In this case it

-        * has to already have the newlines crunched out.
+        * has to already have the newlines crunched out.  If TERMCAP
+        * does not hold a file name then a path of names is searched
+        * instead.  The path is found in the TERMPATH variable, or
+        * becomes "$HOME/.termcap /etc/termcap" if no TERMPATH exists.

         */
         */

-       if (cp && *cp) {
-               if (*cp!='/') {
-                       cp2 = getenv("TERM");
-                       if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
-                               strcpy(bp,cp);
-                               return(tnchktc());
-                       } else {
-                               tf = open(E_TERMCAP, 0);
+       if (!cp || *cp != '/') {        /* no TERMCAP or it holds an entry */
+               if (termpath = getenv("TERMPATH"))
+                       strncpy(pathbuf, termpath, PBUFSIZ);
+               else {
+                       if (home = getenv("HOME")) {    /* set up default */
+                               p += strlen(home);      /* path, looking in */
+                               strcpy(pathbuf, home);  /* $HOME first */
+                               *p++ = '/';
+                       }       /* if no $HOME look in current directory */
+                       strncpy(p, _PATH_DEF, PBUFSIZ - (p - pathbuf));
+               }
+       }
+       else                            /* user-defined name in TERMCAP */
+               strncpy(pathbuf, cp, PBUFSIZ);  /* still can be tokenized */
+
+       *fname++ = pathbuf;     /* tokenize path into vector of names */
+       while (*++p)
+               if (*p == ' ' || *p == ':') {
+                       *p = '\0';
+                       while (*++p)
+                               if (*p != ' ' && *p != ':')
+                                       break;
+                       if (*p == '\0')
+                               break;
+                       *fname++ = p;
+                       if (fname >= pathvec + PVECSIZ) {
+                               fname--;
+                               break;

                        }
                        }

-               } else
-                       tf = open(cp, 0);
+               }
+       *fname = (char *) 0;                    /* mark end of vector */
+       if (cp && *cp && *cp != '/') {
+               tbuf = cp;
+               c = tnamatch(name);
+               tbuf = bp;
+               if (c) {
+                       strcpy(bp,cp);
+                       return (tnchktc());
+               }

        }
        }

-       if (tf==0)
-               tf = open(E_TERMCAP, 0);
-#else
-       tf = open(E_TERMCAP, 0);
-#endif
-       if (tf < 0)
-               return (-1);
+       return (tfindent(bp, name));    /* find terminal entry in path */
+}
+
+/*
+ * tfindent - reads through the list of files in pathvec as if they were one
+ * continuous file searching for terminal entries along the way.  It will
+ * participate in indirect recursion if the call to tnchktc() finds a tc=
+ * field, which is only searched for in the current file and files ocurring
+ * after it in pathvec.  The usable part of this vector is kept in the global
+ * variable pvec.  Terminal entries may not be broken across files.  Parse is
+ * very rudimentary; we just notice escaped newlines.
+ */
+tfindent(bp, name)
+       char *bp, *name;
+{
+       register char *cp;
+       register int c;
+       register int i, cnt;
+       char ibuf[BUFSIZ];
+       int opencnt = 0;
+       int tf;
+
+       tbuf = bp;
+nextfile:
+       i = cnt = 0;
+       while (*pvec && (tf = open(*pvec, 0)) < 0)
+               pvec++;
+       if (!*pvec)
+               return (opencnt ? 0 : -1);
+       opencnt++;

        for (;;) {
                cp = bp;
                for (;;) {
        for (;;) {
                cp = bp;
                for (;;) {


@@ -80,7 +154,8 @@ tgetent(bp, name)
                                cnt = read(tf, ibuf, BUFSIZ);
                                if (cnt <= 0) {
                                        close(tf);
                                cnt = read(tf, ibuf, BUFSIZ);
                                if (cnt <= 0) {
                                        close(tf);

-                                       return (0);
+                                       pvec++;
+                                       goto nextfile;

                                }
                                i = 0;
                        }
                                }
                                i = 0;
                        }


@@ -144,8 +219,10 @@ tnchktc()
                write(2, "Infinite tc= loop\n", 18);
                return (0);
        }
                write(2, "Infinite tc= loop\n", 18);
                return (0);
        }

-       if (tgetent(tcbuf, tcname) != 1)
+       if (tfindent(tcbuf, tcname) != 1) {
+               hopcount = 0;           /* unwind recursion */

                return(0);
                return(0);

+       }

        for (q=tcbuf; *q != ':'; q++)
                ;
        l = p - holdtbuf + strlen(q);
        for (q=tcbuf; *q != ':'; q++)
                ;
        l = p - holdtbuf + strlen(q);


@@ -155,6 +232,7 @@ tnchktc()
        }
        strcpy(p, q+1);
        tbuf = holdtbuf;
        }
        strcpy(p, q+1);
        tbuf = holdtbuf;

+       hopcount = 0;                   /* unwind recursion */

        return(1);
 }
 
        return(1);
 }