Use EXIT_SUCCESS and EXIT_FAILURE to make it clear in the code that the return

code is being inverted. Handle the return value from std::system on Windows
correctly.

Author: Tarun Prabhu

tools/not.cpp

@@ -19,6 +19,8 @@
 #include <sstream>
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #endif
 
@@ -54,33 +56,43 @@ int main(int argc, const char **argv) {
   std::string cmd = ss.str();
 
   int result = std::system(cmd.c_str());
+  int retcode = 0;
+  int signal = 0;
 
 #ifdef _WIN32
   // Handle abort() in msvcrt -- It has exit code as 3.  abort(), aka
   // unreachable, should be recognized as a crash.  However, some binaries use
   // exit code 3 on non-crash failure paths, so only do this if we expect a
   // crash.
-  if (expectCrash && result == 3)
-    result = -3;
-#endif
-
-  // On POSIX systems, result is a composite value of the exit status and,
+  if (expectCrash && result == 3) {
+    retcode = 3;
+    signal = 1;
+  } else {
+    // On Windows, result is the exit code, except for the special case above.
+    retcode = result;
+    signal = 0;
+  }
+#else
+  // On POSIX systems, result is a composite value of the exit code and,
   // potentially, the signal that caused termination of the command.
-  int retcode = WEXITSTATUS(result);
-  int signal = WTERMSIG(result);
+  retcode = WEXITSTATUS(result);
+  signal = WTERMSIG(result);
+#endif
 
-  // If signal is non-zero, then the command caused a crash, usually SIGABRT.
+  // If signal is non-zero, the command caused a crash, usually SIGABRT.
   if (signal) {
     if (expectCrash)
-      return 0;
-    return 1;
+      return EXIT_SUCCESS;
+    return EXIT_FAILURE;
   }
 
-  // The command exited normally, but if we expected a crash, return an error
-  // code.
+  // The command exited normally. If the command was expected to crash, return
+  // EXIT_FAILURE since EXIT_SUCCESS is returned in the event of an expected
+  // crash. Otherwise, invert the return code.
   if (expectCrash)
-    return 1;
-
-  // Otherwise, invert the success code.
-  return retcode == EXIT_SUCCESS;
+    return EXIT_FAILURE;
+  else if (retcode == EXIT_SUCCESS)
+    return EXIT_FAILURE;
+  else
+    return EXIT_SUCCESS;
 }