Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 May 2016 09:27:29 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r299233 - vendor/file/dist/src
Message-ID:  <201605080927.u489RTSK071435@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Sun May  8 09:27:29 2016
New Revision: 299233
URL: https://svnweb.freebsd.org/changeset/base/299233

Log:
  Apply upstream fix 11edb37a71851b5bcbd4e51ca6ad3dcbf57e9761:
  
  Revert: Don't close stdin...

Modified:
  vendor/file/dist/src/magic.c

Modified: vendor/file/dist/src/magic.c
==============================================================================
--- vendor/file/dist/src/magic.c	Sun May  8 09:08:05 2016	(r299232)
+++ vendor/file/dist/src/magic.c	Sun May  8 09:27:29 2016	(r299233)
@@ -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);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605080927.u489RTSK071435>