From 4c938783e676a5a9a427dcd7d184f6de3cc96ecd Mon Sep 17 00:00:00 2001 From: delphij Date: Sun, 8 May 2016 09:30:36 +0000 Subject: [PATCH] MFV r299233: Apply upstream fix 11edb37a71851b5bcbd4e51ca6ad3dcbf57e9761: Revert: Don't close stdin... This have been observed by portupgrade in its interaction with file(1), as reported as a regression in bin/209211. PR: 209211 MFC after: 3 days --- contrib/file/src/magic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/file/src/magic.c b/contrib/file/src/magic.c index 315a94420c4a..8cf62694383d 100644 --- a/contrib/file/src/magic.c +++ b/contrib/file/src/magic.c @@ -346,7 +346,7 @@ private void close_and_restore(const struct magic_set *ms, const char *name, int fd, const struct stat *sb) { - if (name == NULL) + if (fd == STDIN_FILENO || name == NULL) return; (void) close(fd);