Thu Jul 11 20:09:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* nss/nss_files/files-service.c (getservbyname): Take second arg PROTO
	and check it.

	* nss/nss_files/files-XXX.c: Comment fix.

Fri Jul 12 01:28:35 1996  Ulrich Drepper  <drepper@cygnus.com>

	* nss/getXXent_r.c (GETFUNC_NAME_STRING): Define with name
	of reentrant function.
	(setup): Pass additional argument with function name we are
	looking for.
	(SETFUNC_NAME, ENDFUNC_NAME, GETFUNC_NAME): Call setup with
	new argument {SET,END,GET}FUNC_NAME_STRING.

	* nss/getXXent.c (GETFUNC_NAME): RESULT must be static because
	we return a pointer.

Thu Jul 11 18:20:44 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* nss/nss_files/files-parse.c: Add comment about things to #define.

	* nss/nss_files/files-hosts.c (NEED_H_ERRNO): Define it.

	* nss/nss_files/files-parse.c (STRING_FIELD): Don't flag NUL before
	terminator char as an error.

	* nss/getXXbyYY_r.c (REENTRANT_NAME): Set *H_ERRNOP, not h_errno.

Thu Jul 11 03:21:10 1996  Ulrich Drepper  <drepper@cygnus.com>

	* catgets/gencat.c (write_out): Move code to determine new
	best size out of inner loop.

Wed Jul 10 05:24:40 1996  David Mosberger-Tang  <davidm@azstarnet.com>

	* misc/mntent.c: Include <sys/types.h>.
	(endmntent): Return 1 one success, 0 on failure.
	(getmntent): Chop newline and ignore empty lines.

Mon Jul  8 21:18:40 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/dl-machine.h (RESOLVE): New macro, defined
	differently based on [RTLD_BOOTSTRAP].
	(elf_machine_rela): Use it instead of the fn ptr arg directly.

1 files changed, 13 insertions, 5 deletions

diff --git a/misc/mntent.c b/misc/mntent.c
index bdc6aaed79..6cf74c2160 100644
--- a/misc/mntent.c
+++ b/misc/mntent.c
@@ -20,6 +20,7 @@ Cambridge, MA 02139, USA.  */
 #include <mntent.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 
 /* Prepare to begin reading and/or writing mount table entries from the
    beginning of FILE.  MODE is as for `fopen'.  */
@@ -33,7 +34,9 @@ setmntent (const char *file, const char *mode)
 int
 endmntent (FILE *stream)
 {
-  return fclose (stream);
+  if (fclose (stream) != 0) 
+      return 0;
+  return 1;
 }
 
 
@@ -46,15 +49,21 @@ getmntent (FILE *stream)
   static char *buf;
   static size_t bufsiz;
   static struct mntent m;
+  ssize_t nread;
   char *head;
 
   do
     {
-      if (getline (&buf, &bufsiz, stream) < 0)
+      nread = getline (&buf, &bufsiz, stream);
+      if (nread <= 0)
 	return NULL;
 
+      if (buf[nread - 1] == '\n')	/* chop newline */
+	buf[nread - 1] = '\0';
+
       head = buf + strspn (buf, " \t");
-    } while (head[0] == '#');	/* Skip comment lines.  */
+      /* skip empty lines and comment lines:  */
+    } while (head[0] == '\0' || head[0] == '#');
     
   m.mnt_fsname = strsep (&head, " \t") ?: (char *) "";
   if (head)
@@ -66,7 +75,7 @@ getmntent (FILE *stream)
   if (head)
     head += strspn (head, " \t");
   m.mnt_opts = strsep (&head, " \t") ?: (char *) "";
-  switch (head ? sscanf (head, " %d %d\n", &m.mnt_freq, &m.mnt_passno) : 0)
+  switch (head ? sscanf (head, " %d %d ", &m.mnt_freq, &m.mnt_passno) : 0)
     {
     case 0:
       m.mnt_freq = 0;
@@ -114,4 +123,3 @@ hasmntopt (const struct mntent *mnt, const char *opt)
 
   return NULL;
 }
-