diff options
author | Evan Martin <martine@danga.com> | 2012-11-09 17:55:02 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-11-09 17:55:02 (GMT) |
commit | 98bd02a69ef466b36fbf4a9a3ac778589f1031fe (patch) | |
tree | 0f3e43bdef7c65ee184f28500b4a49ba78b96c49 | |
parent | 93e509469953a90f31afc838536b82568da397b2 (diff) | |
parent | d06e3c12ffef42ad845dbd2883e7921a5f89f64d (diff) | |
download | Ninja-98bd02a69ef466b36fbf4a9a3ac778589f1031fe.zip Ninja-98bd02a69ef466b36fbf4a9a3ac778589f1031fe.tar.gz Ninja-98bd02a69ef466b36fbf4a9a3ac778589f1031fe.tar.bz2 |
Merge pull request #458 from rgeary1/minor
Minor improvements to ninja : Different exit code if user presses Ctrl-C, add eclipse to .gitignore, Improve an error message
-rw-r--r-- | .gitignore | 5 | ||||
-rw-r--r-- | src/ninja.cc | 3 | ||||
-rw-r--r-- | src/util.cc | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -15,3 +15,8 @@ TAGS /doc/manual.html /doc/doxygen /gtest-1.6.0 + +# Eclipse project files +.project +.cproject + diff --git a/src/ninja.cc b/src/ninja.cc index e408ce1..7bb5ce3 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -682,6 +682,9 @@ int RunBuild(Builder* builder, int argc, char** argv) { if (!builder->Build(&err)) { printf("ninja: build stopped: %s.\n", err.c_str()); + if (err.find("interrupted by user") != string::npos) { + return 2; + } return 1; } diff --git a/src/util.cc b/src/util.cc index 0feb99d..4b2900f 100644 --- a/src/util.cc +++ b/src/util.cc @@ -155,7 +155,7 @@ bool CanonicalizePath(char* path, size_t* len, string* err) { } if (component_count == kMaxPathComponents) - Fatal("path has too many components"); + Fatal("path has too many components : %s", path); components[component_count] = dst; ++component_count; |