commit 254e0d496e11b30cd9e4f9324f3514be7e85f6d4
author Jean-Baptiste Queru <jbq@google.com> Sun May 06 15:29:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun May 06 15:29:18 2012 -0700
tree 07434cbc1caa297e9964ff24dfdf4047b4325bbc
parent f490b56c61df016f6572fc002cbb4f18660e4e01
parent d98c87c95342ed6eade9f1239122dc9e90dcad67

am d98c87c9: Merge "init: Fix chown and chmod for write-only files"

* commit 'd98c87c95342ed6eade9f1239122dc9e90dcad67':
  init: Fix chown and chmod for write-only files

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index 41fc03e..661c9b1 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -75,12 +75,23 @@
     }
 }
 
+static int _open(const char *path)
+{
+    int fd;
+
+    fd = open(path, O_RDONLY | O_NOFOLLOW);
+    if (fd < 0)
+        fd = open(path, O_WRONLY | O_NOFOLLOW);
+
+    return fd;
+}
+
 static int _chown(const char *path, unsigned int uid, unsigned int gid)
 {
     int fd;
     int ret;
 
-    fd = open(path, O_RDONLY | O_NOFOLLOW);
+    fd = _open(path);
     if (fd < 0) {
         return -1;
     }
@@ -103,7 +114,7 @@
     int fd;
     int ret;
 
-    fd = open(path, O_RDONLY | O_NOFOLLOW);
+    fd = _open(path);
     if (fd < 0) {
         return -1;
     }