summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-03-15 10:06:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-15 10:06:45 -0700
commite657e0c2a4a30104c650e7ad8827e8e887af0cb9 (patch)
treefdcca83024713a98bd8647c3f06199f134ff086c
parentc8c95f86712989003ddd9c55261942d0d83ca9f4 (diff)
parent1a2bdd6fbef8119e05be703658ef7fa2017ecf6e (diff)
downloadsystem_core-e657e0c2a4a30104c650e7ad8827e8e887af0cb9.zip
system_core-e657e0c2a4a30104c650e7ad8827e8e887af0cb9.tar.gz
system_core-e657e0c2a4a30104c650e7ad8827e8e887af0cb9.tar.bz2
am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e': liblog: fix fd leakage
-rw-r--r--liblog/logd_write.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index d812abc..3613d25 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -24,6 +24,8 @@
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <cutils/logger.h>
#include <cutils/logd.h>
@@ -37,7 +39,7 @@
#define log_writev(filedes, vector, count) fakeLogWritev(filedes, vector, count)
#define log_close(filedes) fakeLogClose(filedes)
#else
-#define log_open(pathname, flags) open(pathname, flags)
+#define log_open(pathname, flags) open(pathname, (flags) | O_CLOEXEC)
#define log_writev(filedes, vector, count) writev(filedes, vector, count)
#define log_close(filedes) close(filedes)
#endif