summary refs log tree commit diff
path: root/sysdeps/unix/bsd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-03-14 21:12:49 +0000
committerUlrich Drepper <drepper@redhat.com>1999-03-14 21:12:49 +0000
commit336dfb2d27fdd4c8fb69b5aee7817b595bb23691 (patch)
treeb1190e254b25453d8f70260cfd6e4d6c64f63d27 /sysdeps/unix/bsd
parentcb9245ba930565190b73f86e032fdbf75ec427a0 (diff)
downloadglibc-336dfb2d27fdd4c8fb69b5aee7817b595bb23691.tar.gz
glibc-336dfb2d27fdd4c8fb69b5aee7817b595bb23691.tar.xz
glibc-336dfb2d27fdd4c8fb69b5aee7817b595bb23691.zip
Update.
1999-03-13  Mark Kettenis  <kettenis@gnu.org>

	* sysdeps/unix/bsd/getpt.c (__getpt): Do not use `isatty' to check
	if the opened master pty really is a pty.  `isatty' checks for
	tty-ness and a pty is not a tty.  Return ENOENT instead of ENFILE
	if we are out of pty's.

1999-03-13  Mark Kettenis  <kettenis@gnu.org>

	* sysdeps/generic/utmp_file.c (setutent_file): Make sure the just
	opened file is closed on exec.
	* login/utmp_daemon.c (setutent_daemon): Likewise for the just
	opened socket.

1999-03-13  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/llio.texi (File Position Primitive): Reformat @end
	command.  Patch by Bruno Haible <haible@ilog.fr> [PR libc/1020].

	* nscd/nscd_getpw_r.c (nscd_getpw_r): Set `errno' correctly if no
	entry is found.
	* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
	* nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
Diffstat (limited to 'sysdeps/unix/bsd')
-rw-r--r--sysdeps/unix/bsd/getpt.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c
index 55d87fa2bc..d8070972a5 100644
--- a/sysdeps/unix/bsd/getpt.c
+++ b/sysdeps/unix/bsd/getpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
 
@@ -64,20 +64,14 @@ __getpt (void)
 
 	  fd = __open (buf, O_RDWR);
 	  if (fd != -1)
-	    {
-	      if (__isatty (fd))
-		return fd;
+	    return fd;
 
-	      __close (fd);
-	      continue;
-	    }
-
-	  if (errno != EIO)
+	  if (errno == ENOENT)
 	    return -1;
 	}
     }
 
-  __set_errno (ENFILE);
+  __set_errno (ENOENT);
   return -1;
 }
 weak_alias (__getpt, getpt)