ncurses 5.8 - patch 20110307

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

diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c
index a9e8396959d119380c955e1858aa11713454a019..a9ac642788883011bbc12f252cfa90cc41a26324 100644 (file)
--- a/ncurses/tinfo/name_match.c
+++ b/ncurses/tinfo/name_match.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1999-2007,2008 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,34 +27,47 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  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.8 1999/03/07 01:58:36 tom Exp $")
+MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $")
 
 /*
  *     _nc_first_name(char *names)
  *
  *     Extract the primary name from a compiled entry.
  */
+#define FirstName _nc_globals.first_name
 
-char *_nc_first_name(const char *const sp)
+NCURSES_EXPORT(char *)
+_nc_first_name(const char *const sp)
 /* get the first name from the given name list */
 {
-       static char     buf[MAX_NAME_SIZE+1];
-       register unsigned n;
+    unsigned n;
 
-       for (n = 0; n < sizeof(buf)-1; n++) {
-               if ((buf[n] = sp[n]) == '\0'
-                || (buf[n] == '|'))
-                       break;
+#if NO_LEAKS
+    if (sp == 0) {
+       if (FirstName != 0)
+           FreeAndNull(FirstName);
+    } else
+#endif
+    {
+       if (FirstName == 0)
+           FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
+
+       if (FirstName != 0) {
+           for (n = 0; n < MAX_NAME_SIZE; n++) {
+               if ((FirstName[n] = sp[n]) == '\0'
+                   || (FirstName[n] == '|'))
+                   break;
+           }
+           FirstName[n] = '\0';
        }
-       buf[n] = '\0';
-       return(buf);
+    }
+    return (FirstName);
 }
 
 /*
@@ -63,34 +76,35 @@ char *_nc_first_name(const char *const sp)
  *     Is the given name matched in namelist?
  */
 
-int _nc_name_match(const char *const namelst, const char *const name, const char *const delim)
+NCURSES_EXPORT(int)
+_nc_name_match(const char *const namelst, const char *const name, const char *const delim)
 {
-       const char *s, *d, *t;
-       int code, found;
+    const char *s, *d, *t;
+    int code, found;
 
-       if ((s = namelst) != 0) {
-               while (*s != '\0') {
-                       for (d = name; *d != '\0'; d++) {
-                               if (*s != *d)
-                                       break;
-                               s++;
-                       }
-                       found = FALSE;
-                       for (code = TRUE; *s != '\0'; code = FALSE, s++) {
-                               for (t = delim; *t != '\0'; t++) {
-                                       if (*s == *t) {
-                                               found = TRUE;
-                                               break;
-                                       }
-                               }
-                               if (found)
-                                       break;
-                       }
-                       if (code && *d == '\0')
-                               return code;
-                       if (*s++ == 0)
-                               break;
+    if ((s = namelst) != 0) {
+       while (*s != '\0') {
+           for (d = name; *d != '\0'; d++) {
+               if (*s != *d)
+                   break;
+               s++;
+           }
+           found = FALSE;
+           for (code = TRUE; *s != '\0'; code = FALSE, s++) {
+               for (t = delim; *t != '\0'; t++) {
+                   if (*s == *t) {
+                       found = TRUE;
+                       break;
+                   }
                }
+               if (found)
+                   break;
+           }
+           if (code && *d == '\0')
+               return code;
+           if (*s++ == 0)
+               break;
        }
-       return FALSE;
+    }
+    return FALSE;
 }