commit e74313baf8c2df0525f8a9a72a511b294ef632be
author Rom Lemarchand <romlem@google.com> Mon Jan 28 23:23:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 28 23:23:40 2013 +0000
tree 6492cc8e47d807859b80472e6a71dcc333ac5bb9
parent 45509f9fdde8fafaf66f8583c3255aafcbeaf529
parent 611f5b4b938f2ffcf2a2e71a847e4fd12587ca4b

Merge "logwrap: fix off by 1 argument error"

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 61dd86f..5780001 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -123,7 +123,7 @@
         /* dev is a tmpfs that we can use to carve a shared workspace
          * out of, so let's do that...
          */
-    fd = open("/dev/__properties__", O_RDWR | O_CREAT | O_NOFOLLOW, 0600);
+    fd = open(PROP_FILENAME, O_RDWR | O_CREAT | O_NOFOLLOW, 0644);
     if (fd < 0)
         return -1;
 
@@ -136,12 +136,10 @@
 
     close(fd);
 
-    fd = open("/dev/__properties__", O_RDONLY | O_NOFOLLOW);
+    fd = open(PROP_FILENAME, O_RDONLY | O_NOFOLLOW);
     if (fd < 0)
         return -1;
 
-    unlink("/dev/__properties__");
-
     w->data = data;
     w->size = size;
     w->fd = fd;