Refactored CtrlCHandler usage in slice compilers

1 files changed, 24 insertions, 5 deletions

diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 4ead491dd22..f23c45a9739 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -9,13 +9,24 @@
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
+#include <IceUtil/StaticMutex.h>
 #include <Slice/Preprocessor.h>
-#include <Slice/SignalHandler.h>
 #include <Gen.h>
 
 using namespace std;
 using namespace Slice;
 
+static IceUtil::StaticMutex _mutex = ICE_STATIC_MUTEX_INITIALIZER;
+static bool _interrupted = false;
+
+void
+interruptedCallback(int signal)
+{
+    IceUtil::StaticMutex::Lock lock(_mutex);
+
+    _interrupted = true;
+}
+
 void
 usage(const char* n)
 {
@@ -150,12 +161,11 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
+    IceUtil::CtrlCHandler ctrlCHandler;
+    ctrlCHandler.setCallback(interruptedCallback);
+
     for(i = args.begin(); i != args.end(); ++i)
     {
-        SignalHandler::clearCleanupFileList();
-        IceUtil::CtrlCHandler ctrlCHandler;
-        ctrlCHandler.setCallback(SignalHandler::removeFilesOnInterrupt);
-
         if(depend)
         {
             Preprocessor icecpp(argv[0], *i, cppArgs);
@@ -216,6 +226,15 @@ main(int argc, char* argv[])
                 u->destroy();
             }
         }
+
+        {
+            IceUtil::StaticMutex::Lock lock(_mutex);
+
+            if(_interrupted)
+            {
+                return EXIT_FAILURE;
+            }
+        }
     }
 
     return status;