commit 9c95196bf21e42bf46df9436a84d263c26e972d2
author Laszlo Csomor <laszlocsomor@google.com> Thu Nov 10 13:31:27 2016 +0000
committer Klaus Aehlig <aehlig@google.com> Thu Nov 10 16:17:29 2016 +0000
tree 5960e30273a63b95c5f16ca458d9b3511f3d7092
parent bff767a0e24be19c6535214abb69f3d5d1d24210

Bazel client: wrap some POSIX functions

This change:
- starts using blaze_util::CanAccess and
  blaze_util::PathExists instead of access(2)
- implements and starts using blaze_util::GetCwd
  instead of getcwd(2)
- implements and starts using
  blaze_util::ChangeDirectory instead of chdir(2)
- adds tests for the new wrapper methods

--
MOS_MIGRATED_REVID=138750297

src/main/cpp/option_processor.cc

diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index 1cd1d81..29f59cf 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <algorithm>
 #include <cassert>
 #include <set>
@@ -26,6 +25,7 @@
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/util/file.h"
+#include "src/main/cpp/util/file_platform.h"
 #include "src/main/cpp/util/strings.h"
 #include "src/main/cpp/workspace_layout.h"
 
@@ -180,7 +180,7 @@
     string* error) {
   if (cmdLineRcFile != NULL) {
     string rcFile = MakeAbsolute(cmdLineRcFile);
-    if (access(rcFile.c_str(), R_OK)) {
+    if (!blaze_util::CanAccess(rcFile, true, false, false)) {
       blaze_util::StringPrintf(error,
           "Error: Unable to read .blazerc file '%s'.", rcFile.c_str());
       return blaze_exit_code::BAD_ARGV;
@@ -190,7 +190,7 @@
   }
 
   string workspaceRcFile = blaze_util::JoinPath(workspace, rc_basename);
-  if (!access(workspaceRcFile.c_str(), R_OK)) {
+  if (blaze_util::CanAccess(workspaceRcFile, true, false, false)) {
     *blaze_rc_file = workspaceRcFile;
     return blaze_exit_code::SUCCESS;
   }
@@ -202,7 +202,7 @@
   }
 
   string userRcFile = blaze_util::JoinPath(home, rc_basename);
-  if (!access(userRcFile.c_str(), R_OK)) {
+  if (blaze_util::CanAccess(userRcFile, true, false, false)) {
     *blaze_rc_file = userRcFile;
     return blaze_exit_code::SUCCESS;
   }