From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 7 Nov 2009 19:29:23 +0000 (+0200)
Subject: Open device nodes with close-on-exec flag
X-Git-Tag: android-x86-9.0-r1~1087
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8264b2fd0a56ba10979a3512993301be14cb2c15;p=android-x86%2Fexternal-alsa-lib.git

Open device nodes with close-on-exec flag

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/include/local.h b/include/local.h
index b5a1c453..fa3f0b7f 100644
--- a/include/local.h
+++ b/include/local.h
@@ -230,22 +230,28 @@ extern snd_lib_error_handler_t snd_err_msg;
 # define link_warning(symbol, msg)
 #endif
 
-/* open with resmgr */
-#ifdef SUPPORT_RESMGR
 static inline int snd_open_device(const char *filename, int fmode)
 {
-	int fd = open(filename, fmode);
+	int fd;
+
+#ifdef O_CLOEXEC
+	fmode |= O_CLOEXEC;
+#endif
+	fd = open(filename, fmode);
+
+/* open with resmgr */
+#ifdef SUPPORT_RESMGR
+	if (fd < 0) {
+		if (errno == EAGAIN || errno == EBUSY)
+			return fd;
+		if (! access(filename, F_OK))
+			fd = rsm_open_device(filename, fmode);
+	}
+#endif
 	if (fd >= 0)
-		return fd;
-	if (errno == EAGAIN || errno == EBUSY)
-		return fd;
-	if (! access(filename, F_OK))
-		return rsm_open_device(filename, fmode);
-	return -1;
+		fcntl(fd, F_SETFD, FD_CLOEXEC);
+	return fd;
 }
-#else
-#define snd_open_device(filename, fmode) open(filename, fmode);
-#endif
 
 /* make local functions really local */
 #define snd_dlobj_cache_lookup \