Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(799)

Unified Diff: runtime/bin/directory_android.cc

Issue 1800863002: Cleanup in //runtime/bin (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Windows fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/bin/directory_android.cc
diff --git a/runtime/bin/directory_android.cc b/runtime/bin/directory_android.cc
index 6571f18f86008e0e87e1cb40731747a58439fe92..fda983369c81dc4b7046fc1b68fd9474fa6bcb28 100644
--- a/runtime/bin/directory_android.cc
+++ b/runtime/bin/directory_android.cc
@@ -368,7 +368,7 @@ char* Directory::CurrentNoScope() {
// allocate memory. We need to make our own copy.
char buffer[PATH_MAX];
- if (NULL == getcwd(buffer, PATH_MAX)) {
+ if (getcwd(buffer, PATH_MAX) == NULL) {
return NULL;
}
@@ -377,15 +377,17 @@ char* Directory::CurrentNoScope() {
const char* Directory::Current() {
- char* result = DartUtils::ScopedCString(PATH_MAX);
- ASSERT(result != NULL);
- return getcwd(result, PATH_MAX);
+ char buffer[PATH_MAX];
zra 2016/03/15 18:12:29 Ported fix from Linux.
+ if (getcwd(buffer, PATH_MAX) == NULL) {
+ return NULL;
+ }
+ return DartUtils::ScopedCopyCString(buffer);
}
bool Directory::SetCurrent(const char* path) {
int result = NO_RETRY_EXPECTED(chdir(path));
- return result == 0;
+ return (result == 0);
}

Powered by Google App Engine
This is Rietveld 408576698