ncurses 5.6

[ncurses.git] / ncurses / tinfo / read_termcap.c

diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index a5d5a2cd2939f5dbb50121d69de4dde3f0867d5e..d94d1a42466d8e612c77519e08882576cf0a3e48 100644 (file)
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -58,22 +58,15 @@
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: read_termcap.c,v 1.67 2005/06/04 21:49:20 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.71 2006/07/29 12:06:51 tom Exp $")
 
 #if !PURE_TERMINFO
 
-#if defined(__EMX__) || defined(__DJGPP__)
-#define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \
-                 || (((s)[0] != 0) && ((s)[1] == ':')))
-#else
-#define is_pathname(s) ((s) != 0 && (s)[0] == '/')
-#endif
-
 #define TC_SUCCESS     0
-#define TC_UNRESOLVED -1
-#define TC_NOT_FOUND  -2
-#define TC_SYS_ERR    -3
-#define TC_REF_LOOP   -4
+#define TC_NOT_FOUND  -1
+#define TC_SYS_ERR    -2
+#define TC_REF_LOOP   -3
+#define TC_UNRESOLVED -4       /* this is not returned by BSD cgetent */
 
 static NCURSES_CONST char *
 get_termpath(void)
@@ -232,10 +225,10 @@ _nc_cgetcap(char *buf, const char *cap, int type)
  * Returns:
  *
  * positive #    on success (i.e., the index in db_array)
- * TC_UNRESOLVED if we had too many recurrences to resolve
  * TC_NOT_FOUND  if the requested record couldn't be found
  * TC_SYS_ERR    if a system error was encountered (e.g.,couldn't open a file)
  * TC_REF_LOOP   if a potential reference loop is detected
+ * TC_UNRESOLVED if we had too many recurrences to resolve
  */
 static int
 _nc_cgetent(char **buf, int *oline, char **db_array, const char *name)
@@ -806,7 +799,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
     _nc_str_init(&desc, pathbuf, sizeof(pathbuf));
     if (cp == NULL) {
        _nc_safe_strcpy(&desc, get_termpath());
-    } else if (!is_pathname(cp)) {     /* TERMCAP holds an entry */
+    } else if (!_nc_is_abs_path(cp)) { /* TERMCAP holds an entry */
        if ((termpath = get_termpath()) != 0) {
            _nc_safe_strcat(&desc, termpath);
        } else {
@@ -844,7 +837,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
        }
     }
     *fname = 0;                        /* mark end of vector */
-    if (is_pathname(cp)) {
+    if (_nc_is_abs_path(cp)) {
        if (_nc_cgetset(cp) < 0) {
            return (TC_SYS_ERR);
        }
@@ -897,8 +890,21 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
      * cgetent, then it is the actual filename).
      */
     if (i >= 0) {
+#if HAVE_BSD_CGETENT
+       char temp[PATH_MAX];
+
+       _nc_str_init(&desc, temp, sizeof(temp));
+       _nc_safe_strcpy(&desc, pathvec[i]);
+       _nc_safe_strcat(&desc, ".db");
+       if (_nc_access(temp, R_OK) == 0) {
+           _nc_safe_strcpy(&desc, pathvec[i]);
+       }
+       if ((the_source = strdup(temp)) != 0)
+           *sourcename = the_source;
+#else
        if ((the_source = strdup(pathvec[i])) != 0)
            *sourcename = the_source;
+#endif
     }
 
     return (i);
@@ -935,13 +941,14 @@ add_tc(char *termpaths[], char *path, int count)
 NCURSES_EXPORT(int)
 _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
 {
-    int found = FALSE;
+    int found = TGETENT_NO;
     ENTRY *ep;
 #if USE_GETCAP_CACHE
     char cwd_buf[PATH_MAX];
 #endif
 #if USE_GETCAP
     char *p, tc[TBUFSIZ];
+    int status;
     static char *source;
     static int lineno;
 
@@ -952,19 +959,19 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
        || strcmp(tn, "..") == 0
        || _nc_pathlast(tn) != 0) {
        T(("illegal or missing entry name '%s'", tn));
-       return 0;
+       return TGETENT_NO;
     }
 
     if (use_terminfo_vars() && (p = getenv("TERMCAP")) != 0
-       && !is_pathname(p) && _nc_name_match(p, tn, "|:")) {
+       && !_nc_is_abs_path(p) && _nc_name_match(p, tn, "|:")) {
        /* TERMCAP holds a termcap entry */
        strncpy(tc, p, sizeof(tc) - 1);
        tc[sizeof(tc) - 1] = '\0';
        _nc_set_source("TERMCAP");
     } else {
        /* we're using getcap(3) */
-       if (_nc_tgetent(tc, &source, &lineno, tn) < 0)
-           return (ERR);
+       if ((status = _nc_tgetent(tc, &source, &lineno, tn)) < 0)
+           return (status == TC_NOT_FOUND ? TGETENT_NO : TGETENT_ERR);
 
        _nc_curr_line = lineno;
        _nc_set_source(source);
@@ -1011,7 +1018,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
 
     termpaths[filecount] = 0;
     if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != 0) {
-       if (is_pathname(tc)) {  /* interpret as a filename */
+       if (_nc_is_abs_path(tc)) {      /* interpret as a filename */
            ADD_TC(tc, 0);
            normal = FALSE;
        } else if (_nc_name_match(tc, tn, "|:")) {      /* treat as a capability file */
@@ -1110,7 +1117,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
 #endif /* USE_GETCAP */
 
     if (_nc_head == 0)
-       return (ERR);
+       return (TGETENT_ERR);
 
     /* resolve all use references */
     _nc_resolve_uses2(TRUE, FALSE);
@@ -1145,7 +1152,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
 #if USE_GETCAP_CACHE
                (void) _nc_write_entry(tp);
 #endif
-               found = TRUE;
+               found = TGETENT_YES;
                break;
            }
        }