From 49adfaf5d36d94624790dc9754a2966a8102d2b3 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Fri, 28 Sep 2007 06:33:50 -0600
Subject: [PATCH] Fix test-closein on Solaris 10.
* tests/test-closein.c (main): Don't assume stdin can be inherited
closed on all systems.
* tests/test-closein.sh: Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
---
ChangeLog | 7 +++++++
tests/test-closein.c | 6 +++++-
tests/test-closein.sh | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 292c730750..ebf8ef33f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-28 Eric Blake <ebb9@byu.net>
+
+ Fix test-closein on Solaris 10.
+ * tests/test-closein.c (main): Don't assume stdin can be inherited
+ closed on all systems.
+ * tests/test-closein.sh: Likewise.
+
2007-09-28 Jim Meyering <jim@meyering.net>
* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Fix typo in comment.
diff --git a/tests/test-closein.c b/tests/test-closein.c
index 90214e8e25..cf7b30a4c8 100644
--- a/tests/test-closein.c
+++ b/tests/test-closein.c
@@ -3,7 +3,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include "binary-io.h"
@@ -43,6 +44,9 @@ main (int argc, char **argv)
unreliable on text mode input. */
SET_BINARY (0);
+ if (argc > 2)
+ close (0);
+
if (argc > 1)
i = fread (buf, 1, 6, stdin);
return 0;
diff --git a/tests/test-closein.sh b/tests/test-closein.sh
index 8623ead897..4f5751176e 100755
--- a/tests/test-closein.sh
+++ b/tests/test-closein.sh
@@ -30,7 +30,7 @@ cat ${p}in.tmp | ./test-closein${EXEEXT} consume || exit 1
./test-closein${EXEEXT} consume </dev/null || exit 1
# Test for error when read fails because no file available
-./test-closein${EXEEXT} consume <&- 2>/dev/null && exit 1
+./test-closein${EXEEXT} consume close <&- 2>/dev/null && exit 1
# Cleanup
rm -fr $tmpfiles
--
2.30.2