Moved enum and command-line option in separate file. Also added function that returns...

[oota-llvm.git] / lib / Support / Signals.cpp

diff --git a/lib/Support/Signals.cpp b/lib/Support/Signals.cpp
index 29daedf0fb9a05a3ead305ba4566a725ecc3113a..563147eabf8ddf0286ebb5a2eda9a707503668fb 100644 (file)
--- a/lib/Support/Signals.cpp
+++ b/lib/Support/Signals.cpp
@@ -1,7 +1,7 @@
 //===- Signals.cpp - Signal Handling support ------------------------------===//
 //
 // This file defines some helpful functions for dealing with the possibility of
-// unix signals occuring while your program is running.
+// Unix signals occuring while your program is running.
 //
 //===----------------------------------------------------------------------===//
 
@@ -11,9 +11,9 @@
 #include <cstdlib>
 #include <cstdio>
 #include <signal.h>
-using std::string;
+#include "Config/config.h"     // Get the signal handler return type
 
-static std::vector<string> FilesToRemove;
+static std::vector<std::string> FilesToRemove;
 
 // IntSigs - Signals that may interrupt the program at any time.
 static const int IntSigs[] = {
@@ -24,14 +24,16 @@ static const int *IntSigsEnd = IntSigs + sizeof(IntSigs)/sizeof(IntSigs[0]);
 // KillSigs - Signals that are synchronous with the program that will cause it
 // to die.
 static const int KillSigs[] = {
-  SIGILL, SIGTRAP, SIGABRT, SIGEMT, SIGFPE,
-  SIGBUS, SIGSEGV, SIGSYS, SIGXCPU, SIGXFSZ
+  SIGILL, SIGTRAP, SIGABRT, SIGFPE, SIGBUS, SIGSEGV, SIGSYS, SIGXCPU, SIGXFSZ
+#ifdef SIGEMT
+  , SIGEMT
+#endif
 };
 static const int *KillSigsEnd = KillSigs + sizeof(KillSigs)/sizeof(KillSigs[0]);
 
 
 // SignalHandler - The signal handler that runs...
-static void SignalHandler(int Sig) {
+static RETSIGTYPE SignalHandler(int Sig) {
   while (!FilesToRemove.empty()) {
     std::remove(FilesToRemove.back().c_str());
     FilesToRemove.pop_back();
@@ -41,12 +43,13 @@ static void SignalHandler(int Sig) {
     exit(1);   // If this is an interrupt signal, exit the program
 
   // Otherwise if it is a fault (like SEGV) reissue the signal to die...
+  signal(Sig, SIG_DFL);
 }
 
 static void RegisterHandler(int Signal) { signal(Signal, SignalHandler); }
 
 // RemoveFileOnSignal - The public API
-void RemoveFileOnSignal(const string &Filename) {
+void RemoveFileOnSignal(const std::string &Filename) {
   FilesToRemove.push_back(Filename);
 
   std::for_each(IntSigs, IntSigsEnd, RegisterHandler);