commit e2b32b57df06d2003530d840ee22b860b376e58c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 31 07:22:27 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 31 07:22:27 2020 +0000
tree 2a5bdb0f096f9c12d0aebb332ed83d7b85b63964
parent 6bc990e58bde7769761c79abe39767ca3e59bc5d
parent a59fbd5594f26c678e30849f0688f5103523ff1d

Merge "Fix handling mkdir failure"

main.cc

diff --git a/main.cc b/main.cc
index 3293d2b..4012177 100644
--- a/main.cc
+++ b/main.cc
@@ -21,8 +21,10 @@
 #include <iostream>
 #include <string>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "linkerconfig/apex.h"
 #include "linkerconfig/apexconfig.h"
@@ -211,7 +213,7 @@
     const std::string& base_dir, android::linkerconfig::contents::Context& ctx,
     const android::linkerconfig::modules::ApexInfo& target_apex) {
   std::string dir_path = base_dir + "/" + target_apex.name;
-  if (auto ret = mkdir(dir_path.c_str(), 0755); ret != 0 && ret != EEXIST) {
+  if (auto ret = mkdir(dir_path.c_str(), 0755); ret != 0 && errno != EEXIST) {
     return ErrnoError() << "Failed to create directory " << dir_path;
   }