lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Update.

Browse Source 
2000-01-04  Andreas Jaeger  <aj@suse.de>

	* nss/nss_db/dummy-db.h (struct db24): Add missing field flags.
	(struct db27): Add missing fields byteswapped, join and flags;
	remove wrong member handleq.
	(struct dbc27): Correct lock field.

	* nss/makedb.c: Remove __P.

2000-01-04  Andreas Jaeger  <aj@suse.de>

	* nss/nss_db/db-open.c (internal_setent): Check for db_open for
	success, fix a memory leak and clean up function.

2000-01-04  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile (install): Pass $(install_root) to ldconfig.
	Patch by Akira YOSHIYAMA <yosshy@tkf.att.ne.jp>.

2000-01-03  Jakub Jelinek  <jakub@redhat.com>

	* soft-fp/op-1.h: Fix division for machines using not normalizing
	version of udiv_qrnnd in longlong.h.
	* soft-fp/sysdeps/mips/sfp-machine.h: Likewise.
	* soft-fp/sysdeps/mips/mips64/sfp-machine.h: Likewise.
	* soft-fp/sysdeps/sparc/sparc64/sfp-machine.h: Likewise.
	Patch by Eddie C. Dost <ecd@skynet.be>.

	* soft-fp/soft-fp.h (QItype, UQItype): New types used by longlong.h.

2000-01-03  Andreas Schwab  <schwab@suse.de>

	* sysdeps/generic/dl-sysdep.c: Initialize __libc_multiple_libcs,
	needed for change in common symbol handing in newer binutils.
This commit is contained in:
Ulrich Drepper
2000-01-04 17:51:12 +00:00
parent 52354636d3
commit cbc85992cd
11 changed files with 120 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
nss/nss_db/db-open.c
View File

@ -118,6 +118,9 @@ internal_setent (const char *file, NSS_DB **dbp)
enum nss_status status = NSS_STATUS_SUCCESS;
int err;
void *db;
int fd;
int result;
if (*dbp == NULL)
{
@ -138,77 +141,71 @@ internal_setent (const char *file, NSS_DB **dbp)
err = DL_CALL_FCT (libdb_db_open,
(file, DB_BTREE, DB_RDONLY, 0, NULL, NULL, &db));
/* Construct the object we pass up. */
*dbp = (NSS_DB *) malloc (sizeof (NSS_DB));
if (*dbp != NULL)
{
(*dbp)->db = db;
/* The functions are at different positions for the different
versions. Sigh. */
switch (libdb_version)
{
case db24:
(*dbp)->close =
(int (*) (void *, uint32_t)) ((struct db24 *) db)->close;
(*dbp)->fd =
(int (*) (void *, int *)) ((struct db24 *) db)->fd;
(*dbp)->get =
(int (*) (void *, void *, void *, void *, uint32_t))
((struct db24 *) db)->get;
break;
case db27:
(*dbp)->close =
(int (*) (void *, uint32_t)) ((struct db27 *) db)->close;
(*dbp)->fd =
(int (*) (void *, int *)) ((struct db27 *) db)->fd;
(*dbp)->get =
(int (*) (void *, void *, void *, void *, uint32_t))
((struct db27 *) db)->get;
break;
default:
abort ();
}
}
if (err != 0)
{
__set_errno (err);
*dbp = NULL;
status = err == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
return err == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
}
/* Construct the object we pass up. */
*dbp = (NSS_DB *) malloc (sizeof (NSS_DB));
if (*dbp == NULL)
return NSS_STATUS_UNAVAIL;
(*dbp)->db = db;
/* The functions are at different positions for the different
versions. Sigh. */
switch (libdb_version)
{
case db24:
(*dbp)->close =
(int (*) (void *, uint32_t)) ((struct db24 *) db)->close;
(*dbp)->fd =
(int (*) (void *, int *)) ((struct db24 *) db)->fd;
(*dbp)->get =
(int (*) (void *, void *, void *, void *, uint32_t))
((struct db24 *) db)->get;
break;
case db27:
(*dbp)->close =
(int (*) (void *, uint32_t)) ((struct db27 *) db)->close;
(*dbp)->fd =
(int (*) (void *, int *)) ((struct db27 *) db)->fd;
(*dbp)->get =
(int (*) (void *, void *, void *, void *, uint32_t))
((struct db27 *) db)->get;
break;
default:
abort ();
}
/* We have to make sure the file is `closed on exec'. */
err = DL_CALL_FCT ((*dbp)->fd, (db, &fd));
if (err != 0)
{
__set_errno (err);
result = -1;
}
else
{
/* We have to make sure the file is `closed on exec'. */
int fd;
int result;
int flags = result = fcntl (fd, F_GETFD, 0);
err = DL_CALL_FCT ((*dbp)->fd, (db, &fd));
if (err != 0)
if (result >= 0)
{
__set_errno (err);
result = -1;
flags |= FD_CLOEXEC;
result = fcntl (fd, F_SETFD, flags);
}
else
{
int flags = result = fcntl (fd, F_GETFD, 0);
if (result >= 0)
{
flags |= FD_CLOEXEC;
result = fcntl (fd, F_SETFD, flags);
}
}
if (result < 0)
{
/* Something went wrong. Close the stream and return a
failure. */
DL_CALL_FCT ((*dbp)->close, (db, 0));
status = NSS_STATUS_UNAVAIL;
}
if (result < 0)
*dbp = NULL;
}
if (result < 0)
{
/* Something went wrong. Close the stream and return a
failure. */
DL_CALL_FCT ((*dbp)->close, (db, 0));
status = NSS_STATUS_UNAVAIL;
free (*dbp);
*dbp = NULL;
}
}