2 files changed, 26 insertions, 0 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index a68b54f7da5..9c7dffbc7e6 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -39,6 +39,19 @@ using IceUtilInternal::eb;
 using IceUtilInternal::spar;
 using IceUtilInternal::epar;
 
+//
+// Callback for Crtl-C signal handling
+//
+static Gen* _gen = 0;
+
+static void closeCallback()
+{
+    if(_gen != 0)
+    {
+        _gen->closeOutput();
+    }
+}
+
 static string // Should be an anonymous namespace, but VC++ 6 can't handle that.
 sliceModeToIceMode(Operation::Mode opMode)
 {
@@ -1059,6 +1072,9 @@ Slice::Gen::Gen(const string& name, const string& base, const vector<string>& in
     : _includePaths(includePaths),
       _stream(stream)
 {
+    _gen = this;
+    SignalHandler::setCallback(closeCallback);
+
     string fileBase = base;
     string::size_type pos = base.find_last_of("/\\");
     if(pos != string::npos)
@@ -1130,6 +1146,8 @@ Slice::Gen::~Gen()
     {
         _impl << '\n';
     }
+
+    SignalHandler::setCallback(0);
 }
 
 bool
@@ -1240,6 +1258,13 @@ Slice::Gen::generateChecksums(const UnitPtr& u)
 }
 
 void
+Slice::Gen::closeOutput()
+{
+    _out.close();
+    _impl.close();
+}
+
+void
 Slice::Gen::printHeader()
 {
     static const char* header =
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index 97dfe52b065..bd62d0ad705 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -62,6 +62,7 @@ public:
     void generateImpl(const UnitPtr&);
     void generateImplTie(const UnitPtr&);
     void generateChecksums(const UnitPtr&);
+    void closeOutput();
 
 private: