i686: Regenerate ulps

[thirdparty/glibc.git] / catgets / catgets.c

diff --git a/catgets/catgets.c b/catgets/catgets.c
index c719a0293450eeed24dc3ec6917c69c5a8ecf8a5..e65af31b7cc82d0c6b0ec083e21c88275507ca8e 100644 (file)
--- a/catgets/catgets.c
+++ b/catgets/catgets.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2022 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper, <drepper@gnu.org>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -13,11 +12,9 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
-#include <alloca.h>
 #include <errno.h>
 #include <locale.h>
 #include <nl_types.h>
@@ -36,10 +33,7 @@ catopen (const char *cat_name, int flag)
   __nl_catd result;
   const char *env_var = NULL;
   const char *nlspath = NULL;
-  size_t cat_name_len = strlen (cat_name) + 1;
-  size_t env_var_len = 0;
-  size_t nlspath_len = 0;
-  char *endp;
+  char *tmp = NULL;
 
   if (strchr (cat_name, '/') == NULL)
     {
@@ -54,46 +48,37 @@ catopen (const char *cat_name, int flag)
          || (__libc_enable_secure && strchr (env_var, '/') != NULL))
        env_var = "C";
 
-      env_var_len = strlen (env_var) + 1;
-
       nlspath = getenv ("NLSPATH");
       if (nlspath != NULL && *nlspath != '\0')
        {
          /* Append the system dependent directory.  */
          size_t len = strlen (nlspath) + 1 + sizeof NLSPATH;
-         char *tmp = alloca (len);
+         tmp = malloc (len);
+
+         if (__glibc_unlikely (tmp == NULL))
+           return (nl_catd) -1;
 
          __stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH);
          nlspath = tmp;
-
-         nlspath_len = len;
        }
       else
-       {
-         nlspath = NLSPATH;
-
-         nlspath_len = sizeof NLSPATH;
-       }
+       nlspath = NLSPATH;
     }
 
-  result = (__nl_catd) malloc (sizeof (*result) + cat_name_len
-                              + env_var_len + nlspath_len);
+  result = (__nl_catd) malloc (sizeof (*result));
   if (result == NULL)
-    /* We cannot get enough memory.  */
-    return (nl_catd) -1;
-
-  result->status = closed;
-  result->cat_name = endp = (char *) (result + 1);
-  endp = __mempcpy (endp, cat_name, cat_name_len);
-
-  result->env_var = cat_name_len != 0 ? endp : NULL;
-  endp = __mempcpy (endp, env_var, env_var_len);
-
-  result->nlspath = nlspath_len != 0 ? endp : NULL;
-  memcpy (endp, nlspath, nlspath_len);
-
-  __libc_lock_init (result->lock);
+    {
+      /* We cannot get enough memory.  */
+      result = (nl_catd) -1;
+    }
+  else if (__open_catalog (cat_name, nlspath, env_var, result) != 0)
+    {
+      /* Couldn't open the file.  */
+      free ((void *) result);
+      result = (nl_catd) -1;
+    }
 
+  free (tmp);
   return (nl_catd) result;
 }
 
@@ -112,21 +97,12 @@ catgets (nl_catd catalog_desc, int set, int message, const char *string)
 
   catalog = (__nl_catd) catalog_desc;
 
-  if (catalog->status == closed)
-    __open_catalog (catalog);
-
-  if (catalog->status == nonexisting)
-    {
-      __set_errno (EBADF);
-      return (char *) string;
-    }
-
   idx = ((set * message) % catalog->plane_size) * 3;
   cnt = 0;
   do
     {
-      if (catalog->name_ptr[idx + 0] == (u_int32_t) set
-         && catalog->name_ptr[idx + 1] == (u_int32_t) message)
+      if (catalog->name_ptr[idx + 0] == (uint32_t) set
+         && catalog->name_ptr[idx + 1] == (uint32_t) message)
        return (char *) &catalog->strings[catalog->name_ptr[idx + 2]];
 
       idx += catalog->plane_size * 3;
@@ -144,6 +120,13 @@ catclose (nl_catd catalog_desc)
 {
   __nl_catd catalog;
 
+  /* Be generous if catalog which failed to be open is used.  */
+  if (catalog_desc == (nl_catd) -1)
+    {
+      __set_errno (EBADF);
+      return -1;
+    }
+
   catalog = (__nl_catd) catalog_desc;
 
 #ifdef _POSIX_MAPPED_FILES
@@ -153,7 +136,7 @@ catclose (nl_catd catalog_desc)
 #endif /* _POSIX_MAPPED_FILES */
     if (catalog->status == malloced)
       free ((void *) catalog->file_ptr);
-    else if (catalog->status != closed && catalog->status != nonexisting)
+    else
       {
        __set_errno (EBADF);
        return -1;