Update.cvs/libc-ud-970915

1997-09-16 02:14  Ulrich Drepper  <drepper@cygnus.com>

	Implementation of Hesiod NSS module by Mark Kettenis.
	* hesiod/Makefile: New file.
	* hesiod/hesiod.c: New file.
	* hesiod/hesiod.h: New file.
	* hesiod/hesiod_p.h: New file.
	* hesiod/libnss_hesiod.map: New file.
	* hesiod/nss_hesiod/hesiod-grp.c: New file.
	* hesiod/nss_hesiod/hesiod-pwd.c: New file.
	* hesiod/nss_hesiod/hesiod-service.c: New file.
	* sysdeps/unix/inet/Subdirs: Add hesiod.

	* shlib-versions: Add version number for libnss_hesiod.

	* libio/iolibio.h: Remove definition of _IO_* macros.
	* libio/fileops.c: Define close, fstat, lseek, read, and write as
	macros to use __ protected versions.  Use those functions instead
	of _IO_* functions.
	* libio/iopopen.c: Define _IO_close to close.

	* manual/math.texi: Explain the use of the optimizing inline
	functions.
	Describe rand_r function and tell about SysV RNGs in introduction.

	* resolv/res_send.c (res_send): Use socklen_t type for `fromlen'
	variable.

	* string/Makefile (tests): Add noinl-tester.
	* string/noinl-tester.c: New file.
	* string/tester.c: Add more stpcpy tests for constant arguments for
	all short lengths.

	* string/string.h: Always declare __bzero.
	Describe __NO_STRING_INLINES.
	Always include <bits/string.h>.
	* string/bits/string2.h: Add warning about direct use.
	Change __strcpy_small and __stpcpy_small implementation to use
	macros and provide alternative for platforms which cannot do
	unaligned stores.
	* sysdeps/i386/bits/string.h: Don't define anything is
	__NO_STRING_INLINES is defined.
	* sysdeps/i386/i486/bits/string.h: Change __strcpy_small and
	__stpcpy_small implementation to use macros and provide
	alternative for platforms which cannot do unaligned stores.
	* sysdeps/alpha/bzero.S: Define bzero as weak alias of __bzero.
	* sysdeps/generic/bzero.c: Likewise.
	* sysdeps/i386/bzero.c: Likewise.
	* sysdeps/i386/i586/bzero.S: Likewise.
	* sysdeps/vax/bzero.s: Likewise.

	* sysdeps/generic/bits/select.h: Don't use ugly casts to access array.
	* sysdeps/i386/bits/select.h: Likewise.

	* sysdeps/i386/fpu/bits/mathinline.c (__finite): Relax register
	constraints a bit.
	Don't define and test for _BITS_MATHINLINE_H.  Emit warning if used
	directly and not through math.h.

	* sysdeps/i386/i486/atomicity.h: Change return type of compare_and_swap
	to char to get better code.  Fix typo.
	* sysdeps/stub/atomicity.h: Fix typo.

1997-09-14  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/stpcpy.c: #undef stpcpy and __stpcpy.

1997-09-14  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* string/bits/string2.h: Add prototypes to avoid warning.

1997-09-14  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* string/bits/string2.h (strsep): Fix handling of empty REJECT.
	(__strsep_1c): Handle NULL and empty string.
	(__strsep_g): Likewise.

1997-09-13  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* catgets/Makefile (extra-objs): Set this instead of generated.

	* md5-crypt/Makefile (extra-objs): Add all object file variants of
	onlymd5-entry.

1997-09-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/sysd-stdio.c (__stdio_read): Fix typo in last
	change.

1997-09-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/m68020/atomicity.h: New file.

1997-09-15 05:11  Ulrich Drepper  <drepper@cygnus.com>

	* posix/Makefile (distribute): Add globtest.c and globtest.sh.
	Compile and run globtest if not cross-compiling.
	* posix/globtest.c: New file.
	* posix/globtest.sh: New file.
	* posix/glob.c: Pretty print preprocessor stuff.
	(glob_in_dir): If PATTERN is not really a pattern still check
	whether it is a real file in the current directory and return
	error if not.
	Reported by Eugene Mamchits <eugin@ips.ras.ru>.

	* libio/fileops.c (_IO_file_sync): Acquire lock before doing the work.
	* libio/ioseekoff.c (_IO_seekoff): Likewise.
	* libio/ioseekpos.c (_IO_seekpos): Likewise.

1997-09-13 18:06  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Prevent configuration for unsupported platforms.

1997-09-13 04:07  Ulrich Drepper  <drepper@cygnus.com>

	* elf/rtld.c (dl_main): Make sure we always have a file argument by
	testing for < 2 arguments after recognizing the options.

1997-09-12 11:47  Fila Kolodny  <fila@ibi.com>

	* string/bits/string2.h (__strsep_1c): Cast out const from __retval.
	(__strsep_g): Likewise.

3 files changed, 465 insertions, 0 deletions

diff --git a/hesiod/nss_hesiod/hesiod-grp.c b/hesiod/nss_hesiod/hesiod-grp.c
new file mode 100644
index 0000000..7b0832d
--- /dev/null
+++ b/hesiod/nss_hesiod/hesiod-grp.c
@@ -0,0 +1,150 @@
+/* Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
+
+   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.
+
+   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 <bits/libc-lock.h>
+#include <errno.h>
+#include <hesiod.h>
+#include <nss.h>
+#include <grp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Get the declaration of the parser function.  */
+#define ENTNAME grent
+#define STRUCTURE group
+#define EXTERN_PARSER
+#include <nss/nss_files/files-parse.c>
+
+/* Locks the static variables in this file.  */
+__libc_lock_define_initialized (static, lock);
+
+static void *context = NULL;
+
+static enum nss_status
+internal_setgrent (void)
+{
+  if (!context)
+    {
+      if (hesiod_init (&context) == -1)
+	return NSS_STATUS_UNAVAIL;
+    }
+
+  return NSS_STATUS_SUCCESS;
+}
+
+enum nss_status
+_nss_hesiod_setgrent (void)
+{
+  enum nss_status status;
+
+  __libc_lock_lock (lock);
+
+  status = internal_setgrent ();
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
+
+enum nss_status
+_nss_hesiod_endgrent (void)
+{
+  __libc_lock_lock (lock);
+
+  if (context)
+    {
+      hesiod_end (context);
+      context = NULL;
+    }
+
+  __libc_lock_unlock (lock);
+
+  return NSS_STATUS_SUCCESS;
+}
+
+static enum nss_status
+lookup (const char *name, const char *type, struct group *grp,
+	char *buffer, size_t buflen)
+{
+  enum nss_status status;
+  struct parser_data *data = (void *) buffer;
+  size_t linebuflen;
+  char **list;
+  int parse_res;
+
+  status = internal_setgrent ();
+  if (status != NSS_STATUS_SUCCESS)
+    return status;
+
+  list = hesiod_resolve (context, name, type);
+  if (list == NULL)
+    return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL;
+
+  linebuflen = buffer + buflen - data->linebuffer;
+  if (linebuflen < strlen (*list) + 1)
+    {
+      hesiod_free_list (context, list);
+      __set_errno (ERANGE);
+      return NSS_STATUS_TRYAGAIN;
+    }
+
+  strcpy (buffer, *list);
+  hesiod_free_list (context, list);
+
+  parse_res = _nss_files_parse_grent (buffer, grp, data, buflen);
+  if (parse_res < 1)
+    return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
+
+  return NSS_STATUS_SUCCESS;
+}
+
+enum nss_status
+_nss_hesiod_getgrnam_r (const char *name, struct group *grp,
+			char *buffer, size_t buflen)
+{
+  enum nss_status status;
+
+  __libc_lock_lock (lock);
+
+  status = lookup (name, "group", grp, buffer, buflen);
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
+
+enum nss_status
+_nss_hesiod_getgrgid_r (gid_t gid, struct group *grp,
+			char *buffer, size_t buflen)
+{
+  enum nss_status status = NSS_STATUS_UNAVAIL;
+  char gidstr[21];	/* We will probably never have a gid_t with more
+			   than 64 bits.  */
+
+  snprintf (gidstr, sizeof gidstr, "%d", gid);
+
+  __libc_lock_lock (lock);
+
+  status = lookup (gidstr, "gid", grp, buffer, buflen);
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
diff --git a/hesiod/nss_hesiod/hesiod-pwd.c b/hesiod/nss_hesiod/hesiod-pwd.c
new file mode 100644
index 0000000..bb2a4c8
--- /dev/null
+++ b/hesiod/nss_hesiod/hesiod-pwd.c
@@ -0,0 +1,150 @@
+/* Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
+
+   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.
+
+   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 <bits/libc-lock.h>
+#include <errno.h>
+#include <hesiod.h>
+#include <nss.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Get the declaration of the parser function.  */
+#define ENTNAME pwent
+#define STRUCTURE passwd
+#define EXTERN_PARSER
+#include <nss/nss_files/files-parse.c>
+
+/* Locks the static variables in this file.  */
+__libc_lock_define_initialized (static, lock);
+
+static void *context = NULL;
+
+static enum nss_status
+internal_setpwent (void)
+{
+  if (!context)
+    {
+      if (hesiod_init (&context) == -1)
+	return NSS_STATUS_UNAVAIL;
+    }
+
+  return NSS_STATUS_SUCCESS;
+}
+
+enum nss_status
+_nss_hesiod_setpwent (void)
+{
+  enum nss_status status;
+
+  __libc_lock_lock (lock);
+
+  status = internal_setpwent ();
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
+
+enum nss_status
+_nss_hesiod_endpwent (void)
+{
+  __libc_lock_lock (lock);
+
+  if (context)
+    {
+      hesiod_end (context);
+      context = NULL;
+    }
+
+  __libc_lock_unlock (lock);
+
+  return NSS_STATUS_SUCCESS;
+}
+
+static enum nss_status
+lookup (const char *name, const char *type, struct passwd *pwd,
+	char *buffer, size_t buflen)
+{
+  enum nss_status status;
+  struct parser_data *data = (void *) buffer;
+  size_t linebuflen;
+  char **list;
+  int parse_res;
+
+  status = internal_setpwent ();
+  if (status != NSS_STATUS_SUCCESS)
+    return status;
+
+  list = hesiod_resolve (context, name, type);
+  if (list == NULL)
+    return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL;
+
+  linebuflen = buffer + buflen - data->linebuffer;
+  if (linebuflen < strlen (*list) + 1)
+    {
+      hesiod_free_list (context, list);
+      __set_errno (ERANGE);
+      return NSS_STATUS_TRYAGAIN;
+    }
+
+  strcpy (data->linebuffer, *list);
+  hesiod_free_list (context, list);
+
+  parse_res = _nss_files_parse_pwent (buffer, pwd, data, buflen);
+  if (parse_res < 1)
+    return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
+
+  return NSS_STATUS_SUCCESS;
+}
+
+enum nss_status
+_nss_hesiod_getpwnam_r (const char *name, struct passwd *pwd,
+			char *buffer, size_t buflen)
+{
+  enum nss_status status;
+
+  __libc_lock_lock (lock);
+
+  status = lookup (name, "passwd", pwd, buffer, buflen);
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
+
+enum nss_status
+_nss_hesiod_getpwuid_r (uid_t uid, struct passwd *pwd,
+			char *buffer, size_t buflen)
+{
+  enum nss_status status = NSS_STATUS_UNAVAIL;
+  char uidstr[21];	/* We will probably never have a gid_t with more
+			   than 64 bits.  */
+
+  snprintf (uidstr, sizeof uidstr, "%d", uid);
+
+  __libc_lock_lock (lock);
+
+  status = lookup (uidstr, "uid", pwd, buffer, buflen);
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
diff --git a/hesiod/nss_hesiod/hesiod-service.c b/hesiod/nss_hesiod/hesiod-service.c
new file mode 100644
index 0000000..f74877f
--- /dev/null
+++ b/hesiod/nss_hesiod/hesiod-service.c
@@ -0,0 +1,165 @@
+/* Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
+
+   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.
+
+   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 <bits/libc-lock.h>
+#include <errno.h>
+#include <hesiod.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <nss.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/* Hesiod uses a format for service entries that differs from the
+   traditional format.  We therefore declare our own parser.  */
+
+#define ENTNAME servent
+
+#define ENTDATA servent_data
+struct servent_data {};
+
+#define TRAILING_LIST_MEMBER		s_aliases
+#define TRAILING_LIST_SEPARATOR_P	isspace
+#include <nss/nss_files/files-parse.c>
+#define ISSEMICOLON(c)	((c) ==  ';')
+LINE_PARSER
+("",
+ (void) entdata;
+ STRING_FIELD (result->s_name, ISSEMICOLON, 1);
+ STRING_FIELD (result->s_proto, ISSEMICOLON, 1);
+ INT_FIELD (result->s_port, ISSEMICOLON, 10, 0, htons);
+ )
+
+
+/* Locks the static variables in this file.  */
+__libc_lock_define_initialized (static, lock);
+
+static void *context = NULL;
+
+static enum nss_status
+internal_setservent (void)
+{
+  if (!context)
+    {
+      if (hesiod_init (&context) == -1)
+	return NSS_STATUS_UNAVAIL;
+    }
+
+  return NSS_STATUS_SUCCESS;
+}
+
+enum nss_status
+_nss_hesiod_setservent (void)
+{
+  enum nss_status status;
+
+  __libc_lock_lock (lock);
+
+  status = internal_setservent ();
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}
+
+enum nss_status
+_nss_hesiod_endservent (void)
+{
+  __libc_lock_lock (lock);
+
+  if (context)
+    {
+      hesiod_end (context);
+      context = NULL;
+    }
+
+  __libc_lock_unlock (lock);
+
+  return NSS_STATUS_SUCCESS;
+}
+
+static enum nss_status
+lookup (const char *name, const char *protocol, struct servent *serv,
+	char *buffer, size_t buflen)
+{
+  enum nss_status status;
+  struct parser_data *data = (void *) buffer;
+  size_t linebuflen;
+  char **list, **item;
+  int parse_res;
+  int found;
+
+  status = internal_setservent ();
+  if (status != NSS_STATUS_SUCCESS)
+    return status;
+
+  list = hesiod_resolve (context, name, "service");
+  if (list == NULL)
+    return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL;
+
+  linebuflen = buffer + buflen - data->linebuffer;
+
+  item = list;
+  found = 0;
+  do
+    {
+      if (linebuflen < strlen (*item) + 1)
+	{
+	  hesiod_free_list (context, list);
+	  __set_errno (ERANGE);
+	  return NSS_STATUS_TRYAGAIN;
+	}
+
+      strcpy (data->linebuffer, *item);
+
+      parse_res = parse_line (buffer, serv, data, buflen);
+      if (parse_res == -1)
+	{
+	  hesiod_free_list (context, list);
+	  return NSS_STATUS_TRYAGAIN;
+	}
+
+      if (parse_res > 0)
+	found = protocol == NULL || strcmp (serv->s_proto, protocol) == 0;
+
+      ++item;
+    }
+  while (*item != NULL && !found);
+
+  hesiod_free_list (context, list);
+
+  return found ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND;
+}
+
+enum nss_status
+_nss_hesiod_getservbyname_r (const char *name, const char *protocol,
+			     struct servent *serv,
+			     char *buffer, size_t buflen)
+{
+  enum nss_status status;
+
+  __libc_lock_lock (lock);
+
+  status = lookup (name, protocol, serv, buffer, buflen);
+
+  __libc_lock_unlock (lock);
+
+  return status;
+}