Integrate mainline for Lupe's perlio.c fix before

starting on NetBSD issue

p4raw-id: //depot/perlio@16783

1 files changed, 6 insertions, 2 deletions

diff --git a/perlio.c b/perlio.c
index 23864b56e9..b41b6d2735 100644
--- a/perlio.c
+++ b/perlio.c
@@ -2446,21 +2446,25 @@ PerlIO_importFILE(FILE *stdio, int fl)
 	/* We need to probe to see how we can open the stream
 	   so start with read/write and then try write and read
 	   we dup() so that we can fclose without loosing the fd.
+
+	   Note that the errno value set by a failing fdopen
+	   varies between stdio implementations.
 	 */
 	int fd = PerlLIO_dup(fileno(stdio));
 	char *mode = "r+";
 	FILE *f2 = fdopen(fd, mode);
 	PerlIOStdio *s;
-	if (!f2 && errno == EINVAL) {
+	if (!f2) {
 	    mode = "w";
 	    f2 = fdopen(fd, mode);
 	}
-	if (!f2 && errno == EINVAL) {
+	if (!f2) {
 	    mode = "r";
 	    f2 = fdopen(fd, mode);
 	}
 	if (!f2) {
 	    /* Don't seem to be able to open */
+	    PerlLIO_close(fd);
 	    return f;
 	}
 	fclose(f2);