Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk

1 files changed, 4 insertions, 7 deletions

diff --git a/libio/pclose.c b/libio/pclose.c
index 219be57dbd..be7b330ce7 100644
--- a/libio/pclose.c
+++ b/libio/pclose.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993-2016 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2018 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
@@ -29,15 +29,12 @@
 #include <errno.h>
 #include <shlib-compat.h>
 
+/* POSIX does not require us to check that a stream passed to pclose()
+   was created by popen().  Instead we rely on _IO_SYSCLOSE to call
+   _proc_close when appropriate.  */
 int
 __new_pclose (FILE *fp)
 {
-#if 0
-  /* Does not actually test that stream was created by popen(). Instead,
-     it depends on the filebuf::sys_close() virtual to Do The Right Thing. */
-  if (fp is not a proc_file)
-    return -1;
-#endif
   return _IO_new_fclose (fp);
 }