about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--csu/Makefile2
-rw-r--r--nis/nis_defaults.c35
-rw-r--r--sysdeps/arm/fpu/fsetexcptflg.c38
-rw-r--r--version.h2
5 files changed, 69 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 083751080f..edec159d38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-05-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* version.h: Bump VERSION.
+
+	* csu/Makefile (distribute): Add munch-tmpl.c.
+
 1998-05-23  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
 
 	* nis/nis_defaults.c: Fix buffer problems and typos.
diff --git a/csu/Makefile b/csu/Makefile
index dfc76f2877..7b30d3bba9 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -37,7 +37,7 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
 install-lib = $(start-installed-name) g$(start-installed-name) \
 	      $(csu-dummies)
 distribute = initfini.c gmon-start.c start.c defs.awk munch.awk \
-	     abi-note.S init.c
+	     abi-note.S init.c munch-tmpl.c
 generated = version-info.h
 before-compile = $(objpfx)version-info.h
 
diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 21a80506ff..729bc4c86a 100644
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -72,7 +72,7 @@ searchowner (char *str)
 static u_long
 searchttl (char *str)
 {
-  char buf[1024];
+  char buf[strlen (str) + 1];
   char *cptr, *dptr;
   u_long time;
   int i;
@@ -89,6 +89,7 @@ searchttl (char *str)
     return DEFAULT_TTL;
 
   strncpy (buf, dptr, i);
+  buf[i] = '\0';
   time = 0;
 
   dptr = buf;
@@ -131,7 +132,7 @@ searchttl (char *str)
 static u_long
 searchaccess (char *str, u_long access)
 {
-  char buf[NIS_MAXNAMELEN];
+  char buf[strlen (str) + 1];
   char *cptr;
   u_long result = access;
   int i;
@@ -149,9 +150,12 @@ searchaccess (char *str, u_long access)
     return 0;
 
   strncpy (buf, cptr, i);
+  buf[i] = '\0';
 
   n = o = g = w = 0;
   cptr = buf;
+  if (*cptr == ',') /* Fix for stupid Solaris scripts */
+    ++cptr;
   while (*cptr != '\0')
     {
       switch (*cptr)
@@ -172,7 +176,7 @@ searchaccess (char *str, u_long access)
 	  o = g = w = 1;
 	  break;
 	case '-':
-	  cptr++;		/* Remove "=" from beginning */
+	  cptr++;		/* Remove "-" from beginning */
 	  while (*cptr != '\0' && *cptr != ',')
 	    {
 	      switch (*cptr)
@@ -225,7 +229,7 @@ searchaccess (char *str, u_long access)
 	  n = o = g = w = 0;
 	  break;
 	case '+':
-	  cptr++;		/* Remove "=" from beginning */
+	  cptr++;		/* Remove "+" from beginning */
 	  while (*cptr != '\0' && *cptr != ',')
 	    {
 	      switch (*cptr)
@@ -347,7 +351,8 @@ searchaccess (char *str, u_long access)
 	default:
 	  return result = ULONG_MAX;
 	}
-      cptr++;
+      if (*cptr != '\0')
+	cptr++;
     }
 
   return result;
@@ -356,7 +361,7 @@ searchaccess (char *str, u_long access)
 nis_name
 __nis_default_owner (char *defaults)
 {
-  char default_owner[NIS_MAXNAMELEN];
+  char default_owner[NIS_MAXNAMELEN + 1];
   char *cptr, *dptr;
 
   strcpy (default_owner, nis_local_principal ());
@@ -367,7 +372,8 @@ __nis_default_owner (char *defaults)
       if (dptr != NULL)
 	{
 	  char *p = searchowner (defaults);
-	  strcpy (default_owner, p);
+	  if (strlen (p) <= NIS_MAXNAMELEN)
+	    strcpy (default_owner, p);
 	  free (p);
 	}
     }
@@ -380,7 +386,8 @@ __nis_default_owner (char *defaults)
 	  if (dptr != NULL)
 	    {
 	      char *p = searchowner (cptr);
-	      strcpy (default_owner, p);
+	      if (strlen (p) <= NIS_MAXNAMELEN)
+		strcpy (default_owner, p);
 	      free (p);
 	    }
 	}
@@ -392,7 +399,7 @@ __nis_default_owner (char *defaults)
 nis_name
 __nis_default_group (char *defaults)
 {
-  char default_group[NIS_MAXNAMELEN];
+  char default_group[NIS_MAXNAMELEN + 1];
   char *cptr, *dptr;
 
   strcpy (default_group, nis_local_group ());
@@ -403,7 +410,9 @@ __nis_default_group (char *defaults)
       if (dptr != NULL)
 	{
 	  char *p = searchgroup (defaults);
-	  strcpy (default_group, p);
+
+	  if (strlen (p) <= NIS_MAXNAMELEN)
+	    strcpy (default_group, p);
 	  free (p);
 	}
     }
@@ -416,7 +425,9 @@ __nis_default_group (char *defaults)
 	  if (dptr != NULL)
 	    {
 	      char *p = searchgroup (cptr);
-	      strcpy (default_group, p);
+
+	      if (strlen (p) <= NIS_MAXNAMELEN)
+		strcpy (default_group, p);
 	      free (p);
 	    }
 	}
diff --git a/sysdeps/arm/fpu/fsetexcptflg.c b/sysdeps/arm/fpu/fsetexcptflg.c
new file mode 100644
index 0000000000..f5c06a6f6c
--- /dev/null
+++ b/sysdeps/arm/fpu/fsetexcptflg.c
@@ -0,0 +1,38 @@
+/* Set floating-point environment exception handling.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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 <fenv.h>
+#include <math.h>
+#include <fpu_control.h>
+
+void
+fesetexceptflag (const fexcept_t *flagp, int excepts)
+{
+  fexcept_t temp;
+
+  /* Get the current environment.  */
+  _FPU_GETCW(temp);
+
+  /* Set the desired exception mask.  */
+  temp &= ~((excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT);
+  temp |= (*flagp & excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT;
+
+  /* Save state back to the FPU.  */
+  _FPU_SETCW(temp);
+}
diff --git a/version.h b/version.h
index 0e75f148f8..7223b3a99b 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "experimental"
-#define VERSION "2.0.93"
+#define VERSION "2.0.94"