termcap: split tgetent off

diff --git a/Library/libs/Makefile b/Library/libs/Makefile
index 23bdf44..8d9e413 100644 (file)
--- a/Library/libs/Makefile
+++ b/Library/libs/Makefile
@@ -68,7 +68,7 @@ SRC_HARD += regexp.c
 #SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c
 #SRC_C += memchr.c memcmp.c memcpy.c memset.c
 
-SRC_CT += termcap.c
+SRC_CT += termcap.c tgetent.c
 
 SRC_CURS = $(shell find curses -name '*.c')
 

diff --git a/Library/libs/termcap.c b/Library/libs/termcap.c
index 0e81d04..c463d18 100644 (file)
--- a/Library/libs/termcap.c
+++ b/Library/libs/termcap.c
@@ -41,87 +41,7 @@
 #include <ctype.h>
 #include <string.h>
 
-char *capab = (char *) NULL;   /* the capability itself */
-
-#if 0
-/*  The following are not yet used.  */
-extern short ospeed;           /* output speed */
-extern char PC;                        /* padding character */
-extern char *BC;               /* back cursor movement */
-extern char *UP;               /* up cursor movement */
-#endif
-
-
-/*
- *     tgetent - get the termcap entry for terminal name, and put it
- *     in bp (which must be an array of 1024 chars). Returns 1 if
- *     termcap entry found, 0 if not found, and -1 if file not found.
- */
-
-int tgetent(char *bp, const char *name)
-{
-    FILE *fp;
-    const char *file;
-    char *term;
-    short len = strlen(name);
-
-    capab = bp;
-
-    /* If TERMCAP begins with a '/' then use TERMCAP as the path   */
-    /* Name of the termcap definitions file. If TERMCAP is a       */
-    /* Definition and TERM equals "name" then use TERMCAP as the   */
-    /* Definition. Otherwise use "/etc/termcap" as the path name.  */
-
-    if ((file = getenv("TERMCAP")) == (char *) NULL)
-       file = "/etc/termcap";
-    else if (*file != '/')
-       if ((term = getenv("TERM")) != (char *) NULL
-           && strcmp(term, name) == 0) {
-           strlcpy(bp, file, 1023);
-           return (1);
-       } else
-           file = "/etc/termcap";
-
-    if ((fp = fopen(file, "r")) == (FILE *) NULL) {
-       capab = (char *) NULL;  /* no valid termcap  */
-       return (-1);
-    }
-    for (;;) {
-       /* Read in each definition */
-       int def_len = 0;
-       char *cp = bp;
-
-       do {
-           if (fgets(&bp[def_len], (unsigned int) (1024 - def_len), fp) ==
-               (char *) NULL) {
-               fclose(fp);
-               capab = (char *) NULL;  /* no valid termcap */
-               return (0);
-           }
-           def_len = strlen(bp) - 2;
-       } while (bp[def_len] == '\\');
-
-       while (isspace(*cp))
-           cp++;
-
-       /* Comment lines start with a '#'  */
-       if (*cp == '#')
-           continue;
-
-       /* See if any of the terminal names in this definition */
-       /* Match "name".                                       */
-
-       do {
-           if (strncmp(name, cp, len) == 0 &&
-               (cp[len] == '|' || cp[len] == ':')) {
-               fclose(fp);
-               return (1);
-           }
-           while ((*cp) && (*cp != '|') && (*cp != ':'))
-               cp++;
-       } while (*cp++ == '|');
-    }
-}
+char *capab;           /* the capability itself */
 
 
 /*

diff --git a/Library/libs/tgetent.c b/Library/libs/tgetent.c
new file mode 100644 (file)
index 0000000..ab696f3
--- /dev/null
+++ b/Library/libs/tgetent.c
@@ -0,0 +1,124 @@
+/*
+ *     termcap.c       V1.1    20/7/87         agc     Joypace Ltd
+ *
+ *     Copyright Joypace Ltd, London, UK, 1987. All rights reserved.
+ *     This file may be freely distributed provided that this notice
+ *     remains attached.
+ *
+ *     A public domain implementation of the termcap(3) routines.
+ *
+ *
+ *
+ *      Klamer Schutte       V1.2    Nov. 1988
+ *
+ *   - Can match multiple terminal names                [tgetent]
+ *   - Removal of **area assignments                    [tgetstr]
+ *
+ *      Terrence W. Holm     V1.3    May, Sep, Oct.  1988
+ *
+ *  - Correct when TERM != name and TERMCAP is defined  [tgetent]
+ *  - Correct the comparison for the terminal name      [tgetent]
+ *  - Correct the value of ^x escapes                   [tgetstr]
+ *  - Added %r to reverse row/column                    [tgoto]
+ *  - Fixed end of definition test                      [tgetnum/flag/str]
+ *
+ *      Terrence W. Holm     V1.4    Jan. 1989
+ *
+ *   - Incorporated Klamer's V1.2 fixes into V1.3
+ *   - Added %d, (old %d is now %2)                     [tgoto]
+ *   - Allow '#' comments in definition file            [tgetent]
+ *
+ * FIXME:
+ *     - support the use of some kind of < 1024 byte buffer
+ *       interface
+ *     - avoid the use of stdio (state machine search for either
+ *       [start of file]name: or \nname:)
+ */
+
+#include <termcap.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
+extern char *capab;            /* the capability itself */
+
+#if 0
+/*  The following are not yet used.  */
+extern short ospeed;           /* output speed */
+extern char PC;                        /* padding character */
+extern char *BC;               /* back cursor movement */
+extern char *UP;               /* up cursor movement */
+#endif
+
+
+/*
+ *     tgetent - get the termcap entry for terminal name, and put it
+ *     in bp (which must be an array of 1024 chars). Returns 1 if
+ *     termcap entry found, 0 if not found, and -1 if file not found.
+ */
+
+int tgetent(char *bp, const char *name)
+{
+    FILE *fp;
+    const char *file;
+    char *term;
+    short len = strlen(name);
+
+    capab = bp;
+
+    /* If TERMCAP begins with a '/' then use TERMCAP as the path   */
+    /* Name of the termcap definitions file. If TERMCAP is a       */
+    /* Definition and TERM equals "name" then use TERMCAP as the   */
+    /* Definition. Otherwise use "/etc/termcap" as the path name.  */
+
+    if ((file = getenv("TERMCAP")) == (char *) NULL)
+       file = "/etc/termcap";
+    else if (*file != '/')
+       if ((term = getenv("TERM")) != (char *) NULL
+           && strcmp(term, name) == 0) {
+           strlcpy(bp, file, 1023);
+           return (1);
+       } else
+           file = "/etc/termcap";
+
+    if ((fp = fopen(file, "r")) == (FILE *) NULL) {
+       capab = (char *) NULL;  /* no valid termcap  */
+       return (-1);
+    }
+    for (;;) {
+       /* Read in each definition */
+       int def_len = 0;
+       char *cp = bp;
+
+       do {
+           if (fgets(&bp[def_len], (unsigned int) (1024 - def_len), fp) ==
+               (char *) NULL) {
+               fclose(fp);
+               capab = (char *) NULL;  /* no valid termcap */
+               return (0);
+           }
+           def_len = strlen(bp) - 2;
+       } while (bp[def_len] == '\\');
+
+       while (isspace(*cp))
+           cp++;
+
+       /* Comment lines start with a '#'  */
+       if (*cp == '#')
+           continue;
+
+       /* See if any of the terminal names in this definition */
+       /* Match "name".                                       */
+
+       do {
+           if (strncmp(name, cp, len) == 0 &&
+               (cp[len] == '|' || cp[len] == ':')) {
+               fclose(fp);
+               return (1);
+           }
+           while ((*cp) && (*cp != '|') && (*cp != ':'))
+               cp++;
+       } while (*cp++ == '|');
+    }
+}