-/* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+/* Copyright (C) 1996, 1997, 1998, 1999 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 Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include <alloca.h>
+#include <errno.h>
#include <nl_types.h>
#include <stdlib.h>
#include <string.h>
{
__nl_catd result;
const char *env_var;
+ const char *nlspath;
- result = (__nl_catd) malloc (sizeof (__nl_catd));
+ result = (__nl_catd) malloc (sizeof (*result));
if (result == NULL)
/* We cannot get enough memory. */
return (nl_catd) -1;
result->status = closed;
- result->cat_name = strdup (cat_name);
+ result->cat_name = __strdup (cat_name);
if (result->cat_name == NULL)
{
free (result);
+ __set_errno (ENOMEM);
return (nl_catd) -1;
}
env_var = "C";
}
- result->env_var = strdup (env_var);
+ result->env_var = __strdup (env_var);
if (result->env_var == NULL)
{
free ((void *) result->cat_name);
free ((void *) result);
+ __set_errno (ENOMEM);
return (nl_catd) -1;
}
- if (getenv ("NLSPATH") != NULL)
- result->nlspath = strdup (getenv ("NLSPATH"));
+ nlspath = __secure_getenv ("NLSPATH");
+ if (nlspath != NULL && *nlspath != '\0')
+ {
+ /* Append the system dependent directory. */
+ size_t len = strlen (nlspath) + 1 + sizeof NLSPATH;
+ char *tmp = alloca (len);
+
+ __stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH);
+ nlspath = tmp;
+ }
else
- result->nlspath = strdup (NLSPATH);
+ nlspath = NLSPATH;
+ result->nlspath = __strdup (nlspath);
if (result->nlspath == NULL)
{
free ((void *) result->cat_name);
free ((void *) result->env_var);
free ((void *) result);
+ __set_errno (ENOMEM);
return (nl_catd) -1;
}
}
result->nlspath = NULL;
}
+ __libc_lock_init (result->lock);
+
return (nl_catd) result;
}
catalog = (__nl_catd) catalog_desc;
if (catalog->status == closed)
- __open_catalog (catalog, 1);
+ __open_catalog (catalog);
if (catalog->status == nonexisting)
- return (char *) string;
+ {
+ __set_errno (EBADF);
+ return (char *) string;
+ }
idx = ((set * message) % catalog->plane_size) * 3;
cnt = 0;
}
while (++cnt < catalog->plane_depth);
+ __set_errno (ENOMSG);
return (char *) string;
}
catalog = (__nl_catd) catalog_desc;
- if (catalog->status == mmaped)
- munmap ((void *) catalog->file_ptr, catalog->file_size);
- else if (catalog->status == malloced)
- free ((void *) catalog->file_ptr);
- else if (catalog->status != closed && catalog->status != nonexisting)
- return -1;
+#ifdef _POSIX_MAPPED_FILES
+ if (catalog->status == mmapped)
+ __munmap ((void *) catalog->file_ptr, catalog->file_size);
+ else
+#endif /* _POSIX_MAPPED_FILES */
+ if (catalog->status == malloced)
+ free ((void *) catalog->file_ptr);
+ else if (catalog->status != closed && catalog->status != nonexisting)
+ {
+ __set_errno (EBADF);
+ return -1;
+ }
if (catalog->nlspath)
free ((void *) catalog->nlspath);