From 8cbe82fbc11b1fabeed25107d5f768bd5c53e754 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 18 Apr 2012 14:23:17 -0500
Subject: Cleanup tsak FIFOs if unable to initialize and enter running state
 (cherry picked from commit 632eda3b6c6d9aa903e31d3533e8bcb631868d0b)

---
 tsak/main.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'tsak/main.cpp')

diff --git a/tsak/main.cpp b/tsak/main.cpp
index 24a71666d..ddd8cef88 100644
--- a/tsak/main.cpp
+++ b/tsak/main.cpp
@@ -330,14 +330,20 @@ class PipeHandler
 public:
 	PipeHandler();
 	~PipeHandler();
+
+	bool active;
 };
 
 PipeHandler::PipeHandler()
 {
+	active = false;
 }
 
 PipeHandler::~PipeHandler()
 {
+	if (active) {
+		tearDownPipe();
+	}
 	tearDownLockingPipe();
 }
 
@@ -388,6 +394,8 @@ int main (int argc, char *argv[])
 	}
 
 	while (1) {
+		controlpipe.active = true;
+
 		if ((getuid ()) != 0) {
 			printf ("You are not root! This WILL NOT WORK!\nDO NOT attempt to bypass security restrictions, e.g. by changing keyboard permissions or owner, if you want the SAK system to remain secure...\n");
 			return 5;
@@ -405,7 +413,9 @@ int main (int argc, char *argv[])
 				sleep(1);
 			else {
 				int i=fork();
-				if (i<0) return 12; // fork failed
+				if (i<0) {
+					return 12; // fork failed
+				}
 				if (i>0) {
 					return 4;
 				}
@@ -545,9 +555,12 @@ int main (int argc, char *argv[])
 
 				// fork udev monitor process
 				int i=fork();
-				if (i<0) return 10; // fork failed
+				if (i<0) {
+					return 10; // fork failed
+				}
 				if (i>0) {
 					// Terminate parent
+					controlpipe.active = false;
 					return 0;
 				}
 
-- 
cgit v1.2.3