commit 3badcdead366eb89cadd28e84f06e37067e62c99
author Christopher Wiley <wiley@google.com> Fri Nov 06 10:59:27 2015 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 06 21:01:12 2015 +0000
tree 7607cc3a643ab06389e10173245ab1d19df4d7e1
parent b7014328e383c1e45a1687499eef09decd68d044

Fix directory creation on OSX

There are cases when mkdir(2) returns EISDIR on OSX expect and tolerate
this.

Bug: 25559586
Test: compiles, unittests pass

Change-Id: I72a467c7057d67c430c5a0d37774c93ad6c20576

io_delegate.cpp

diff --git a/io_delegate.cpp b/io_delegate.cpp
index caf8345..85faf67 100644
--- a/io_delegate.cpp
+++ b/io_delegate.cpp
@@ -96,7 +96,8 @@
     success = mkdir(base_dir.c_str(),
                     S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == 0;
 #endif
-    if (!success && errno != EEXIST) {
+    // On darwin when you try to mkdir("/", ...) we get EISDIR.
+    if (!success && (errno != EEXIST && errno != EISDIR)) {
        LOG(ERROR) << "Error while creating directories: " << strerror(errno);
        return false;
     }