ncurses 5.9 - patch 20130608

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

diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c
index fee3ba3bc7116b9bba5077aae5e1b9758df5b441..c648535526d2f012d0351e5eb39eed40a8a6d97d 100644 (file)
--- a/ncurses/tinfo/name_match.c
+++ b/ncurses/tinfo/name_match.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2012,2013 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            *
@@ -27,53 +27,69 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1999                        *
+ *  Author: Thomas E. Dickey                    1999-on                     *
  ****************************************************************************/
 
 #include <curses.priv.h>
-#include <term.h>
 #include <tic.h>
 
-MODULE_ID("$Id: name_match.c,v 1.15 2005/01/22 21:47:25 tom Exp $")
+MODULE_ID("$Id: name_match.c,v 1.23 2013/05/25 20:20:08 tom Exp $")
+
+#define FirstName _nc_globals.first_name
+
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+static const char *
+skip_index(const char *name)
+{
+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
+       const char *bar = strchr(name, '|');
+       if (bar != 0 && (bar - name) == 2)
+           name = bar + 1;
+    }
+    return name;
+}
+#endif
 
 /*
- *     _nc_first_name(char *names)
- *
- *     Extract the primary name from a compiled entry.
+ * Get the primary name from the given name list.  For terminfo, this is the
+ * first name.  For termcap, this may be the second name, if the first one
+ * happens to be two characters.
  */
-
 NCURSES_EXPORT(char *)
 _nc_first_name(const char *const sp)
-/* get the first name from the given name list */
 {
-    static char *buf;
-    register unsigned n;
+    unsigned n;
 
 #if NO_LEAKS
     if (sp == 0) {
-       if (buf != 0)
-           FreeAndNull(buf);   /* for leak-testing */
-       return 0;
-    }
+       if (FirstName != 0) {
+           FreeAndNull(FirstName);
+       }
+    } else
 #endif
+    {
+       if (FirstName == 0)
+           FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
 
-    if (buf == 0)
-       buf = typeMalloc(char, MAX_NAME_SIZE + 1);
-    for (n = 0; n < MAX_NAME_SIZE; n++) {
-       if ((buf[n] = sp[n]) == '\0'
-           || (buf[n] == '|'))
-           break;
+       if (FirstName != 0) {
+           const char *src = sp;
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+           src = skip_index(sp);
+#endif
+           for (n = 0; n < MAX_NAME_SIZE; n++) {
+               if ((FirstName[n] = src[n]) == '\0'
+                   || (FirstName[n] == '|'))
+                   break;
+           }
+           FirstName[n] = '\0';
+       }
     }
-    buf[n] = '\0';
-    return (buf);
+    return (FirstName);
 }
 
 /*
- *     int _nc_name_match(namelist, name, delim)
- *
- *     Is the given name matched in namelist?
+ * Is the given name matched in namelist?
  */
-
 NCURSES_EXPORT(int)
 _nc_name_match(const char *const namelst, const char *const name, const char *const delim)
 {