commit 95376c1d36600982c6546ad2101b3bf4a1973aa1
author Joe Onorato <joeo@google.com> Fri Oct 21 21:35:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 21 21:35:43 2016 +0000
tree f0c3be49771fc52e5a95002f25ac462084c752a5
parent 22564ecc2a3b2500d1bbf2666e834bcef27dfd9e
parent 8a5bb6370cd01990d2bb9f74dc4c777d68e95adc

Merge "Fix mac build of bit"

tools/bit/main.cpp

diff --git a/tools/bit/main.cpp b/tools/bit/main.cpp
index 04836ad..4974a44 100644
--- a/tools/bit/main.cpp
+++ b/tools/bit/main.cpp
@@ -518,14 +518,17 @@
             // makes all the filenames long when being pretty printed.
             return "out";
         } else {
-            char* pwd = get_current_dir_name();
+            char pwd[PATH_MAX];
+            if (getcwd(pwd, PATH_MAX) == NULL) {
+                fprintf(stderr, "Your pwd is too long.\n");
+                exit(1);
+            }
             const char* slash = strrchr(pwd, '/');
             if (slash == NULL) {
                 slash = "";
             }
             string result(common_base);
             result += slash;
-            free(pwd);
             return result;
         }
     }