ncurses 5.9 - patch 20120303

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

diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c
index d576901fa2e93f8bffbea1424eb7de34e8e9c800..fccd26491e44d611d603d26e7d3bc546d5f2795e 100644 (file)
--- a/ncurses/tinfo/name_match.c
+++ b/ncurses/tinfo/name_match.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2008,2011 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            *
@@ -31,21 +31,32 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
-#include <term.h>
 #include <tic.h>
 
-MODULE_ID("$Id: name_match.c,v 1.17 2008/08/03 19:49:33 tom Exp $")
+MODULE_ID("$Id: name_match.c,v 1.21 2011/08/13 20:23:12 tom Exp $")
 
-/*
- *     _nc_first_name(char *names)
- *
- *     Extract the primary name from a compiled entry.
- */
 #define FirstName _nc_globals.first_name
 
+#if 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
+
+/*
+ * 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 */
 {
     unsigned n;
 
@@ -60,8 +71,12 @@ _nc_first_name(const char *const sp)
            FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
 
        if (FirstName != 0) {
+           const char *src = sp;
+#if USE_TERMCAP && NCURSES_XNAMES
+           src = skip_index(sp);
+#endif
            for (n = 0; n < MAX_NAME_SIZE; n++) {
-               if ((FirstName[n] = sp[n]) == '\0'
+               if ((FirstName[n] = src[n]) == '\0'
                    || (FirstName[n] == '|'))
                    break;
            }
@@ -72,11 +87,8 @@ _nc_first_name(const char *const sp)
 }
 
 /*
- *     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)
 {