Merge pull request ninja-build#579 from rui314/master

Minor fixes
cjhopman · May 23, 2013 · e659bbf · e659bbf
2 parents 082d0be + c3237b9
commit e659bbf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/HACKING.md b/HACKING.md
@@ -62,7 +62,7 @@ googletest (gtest) library.
 * On newer Ubuntus it's only distributed as source
 
         apt-get install libgtest-dev
-        ./configure --with-gtest=/usr/src/gtest
+        ./configure.py --with-gtest=/usr/src/gtest
 
 * Otherwise you need to download it, unpack it, and pass
   `--with-gtest` to `configure.py`.  Get it from [its downloads

diff --git a/src/ninja.cc b/src/ninja.cc
@@ -807,9 +807,14 @@ int NinjaMain(int argc, char** argv) {
       case 'f':
         input_file = optarg;
         break;
-      case 'j':
-        config.parallelism = atoi(optarg);
+      case 'j': {
+        char* end;
+        int value = strtol(optarg, &end, 10);
+        if (*end != 0 || value <= 0)
+          Fatal("invalid -j parameter");
+        config.parallelism = value;
         break;
+      }
       case 'k': {
         char* end;
         int value = strtol(optarg, &end, 10);