diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-08-29 01:19:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-08-29 01:19:12 +0000 |
| commit | 39e16978c3b4ac8eaf2201fac56316623910d9da (patch) | |
| tree | 054fff18119b31464b3133ad91050694130c7d2a /catgets/catgets.c | |
| parent | 92f1da4da04a7a86ddee91be5eaf0b10c333ac64 (diff) | |
Update.cvs/libc-ud-970828
1997-08-29 02:36 Ulrich Drepper <drepper@cygnus.com>
* Makefile (version-info.h): Use ISO form for the date.
* catgets/catgetsinfo.h: Include <bits/libc-lock.h>.
(struct catalog_obj): Add lock field.
(__open_catalog): Remove second parameter from prototype.
* catgets/catgets.c (catopen): Initialize lock field.
(catgets): Don't pass second parameter to __open_catalog.
* catgets/gencat.c: Initialize lock field and don't pass second
parameter to __open_catalog.
* catgets/open_catalog.c (__open_catalog): Decide about use of
path by examining path in struct, not based on extra argument.
Acquire a the lock before trying to load the catalog and release
it before returning.
* csu/Makefile (abi-tag.h): Make sure target directory exists.
* io/Makefile (headers): Add bits/poll.h.
* io/sys/poll.h: Remove definitions of POLL* constants.
Include <bits/poll.h>.
* sysdeps/generic/bits/poll.h: New file.
* sysdeps/unix/sysv/linux/bits/poll.h: New file.
* sysdeps/unix/sysv/linux/m68k/bits/poll.h: New file.
* sysdeps/unix/sysv/linux/mips/bits/poll.h: New file.
* sysdeps/unix/sysv/linux/sparc/bits/poll.h: New file.
* libio/fileops.c (_IO_file_read, _IO_file_write): Remove dead code.
* malloc/obstack.c: Add casts to keep very verbose compilers on
64bit machine quiet.
* nss/Makefile (libnss_db.so): Find libdb.so in db2 directory.
1997-08-28 17:30 Ulrich Drepper <drepper@cygnus.com>
* catgets/catgets.c (catopen): Correctly determine length of string
in NLSPATH evironment variable. Patch by HJ Lu <hjl@gnu.ai.mit.edu>.
1997-08-27 23:19 Richard Henderson <rth@cygnus.com>
* sysdeps/generic/dl-sysdep.c (DL_FIND_ARG_COMPONENTS): Provide
default macro to track down arguments from stack start.
(_dl_sysdep_start): Use it.
* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Truncate to simply
providing a special DL_FIND_ARG_COMPONENTS and including the next
file up the line.
* sysdeps/powerpc/e_sqrt.c: Move contents to w_sqrt.c and provide stub.
* sysdeps/powerpc/e_sqrtf.c: Likewise.
* sysdeps/powerpc/s_copysignf.S: Provide empty file; symbol is with
the double precision version.
* sysdeps/powerpc/s_fabsf.S: Likewise.
* sysdeps/powerpc/s_isnanf.S: Likewise.
Diffstat (limited to 'catgets/catgets.c')
| -rw-r--r-- | catgets/catgets.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/catgets/catgets.c b/catgets/catgets.c index 4c6997e567..d5eefc9e08 100644 --- a/catgets/catgets.c +++ b/catgets/catgets.c @@ -87,7 +87,7 @@ catopen (const char *cat_name, int flag) if (nlspath != NULL && *nlspath != '\0') { /* Append the system dependent directory. */ - size_t len = strlen (nlspath + 1 + sizeof NLSPATH); + size_t len = strlen (nlspath) + 1 + sizeof NLSPATH; char *tmp = alloca (len); __stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH); @@ -111,6 +111,8 @@ catopen (const char *cat_name, int flag) result->nlspath = NULL; } + __libc_lock_init (result->lock); + return (nl_catd) result; } @@ -130,7 +132,7 @@ catgets (nl_catd catalog_desc, int set, int message, const char *string) catalog = (__nl_catd) catalog_desc; if (catalog->status == closed) - __open_catalog (catalog, 1); + __open_catalog (catalog); if (catalog->status == nonexisting) { |