From a8b362f89d8f4891daed63e336677e9b300efa71 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Wed, 21 Aug 2013 16:46:52 +0100
Subject: [PATCH] fix some warnings

---
 configure.ac               |  2 +-
 src/server/handle_accept.c | 39 +++++++++++++++++++-------------------
 src/stream/read.c          |  1 +
 src/stream/write.c         |  1 +
 src/taskrambler.c          |  6 ++++--
 src/utils/daemonize.c      |  7 +++++--
 tests/loggerTest.c         |  4 +++-
 tests/serverTest.c         |  4 +++-
 8 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index 16bb994..fff3090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([taskrambler], [0.0.1], [Georg Hopp <georg@steffers.org>])
 LT_INIT
 AM_INIT_AUTOMAKE
 #AM_INIT_AUTOMAKE([subdir-objects])
-#AM_SILENT_RULES([yes])
+AM_SILENT_RULES([yes])
 AC_COPYRIGHT([Copyright © 2012 Georg Hopp])
 AC_REVISION([$Revision: 0.02 $])
 AC_CONFIG_SRCDIR([src/taskrambler.c])
diff --git a/src/server/handle_accept.c b/src/server/handle_accept.c
index ab0cb83..f7c912b 100644
--- a/src/server/handle_accept.c
+++ b/src/server/handle_accept.c
@@ -46,25 +46,26 @@ serverHandleAccept(Server this, unsigned int i)
 	acc = socketAccept((0 == i)? this->sock : this->sockSSL, &remoteAddr);
 
 	if (-1 != acc->handle) {
-	switch(i) {
-		case 0:
-			// no SSL
-			st = new(Stream, STREAM_FD, acc->handle);
-			break;
-
-		case 1:
-			// SSL
-			{
-				SSL * ssl = SSL_new(this->ctx);
-				SSL_set_fd(ssl, acc->handle);
-				SSL_accept(ssl);
-				st = new(Stream, STREAM_SSL, ssl);
-			}
-			break;
-
-		default:
-			break;
-	}
+		switch(i) {
+			case 0:
+				// no SSL
+				st = new(Stream, STREAM_FD, acc->handle);
+				break;
+
+			case 1:
+				// SSL
+				{
+					SSL * ssl = SSL_new(this->ctx);
+					SSL_set_fd(ssl, acc->handle);
+					SSL_accept(ssl);
+					st = new(Stream, STREAM_SSL, ssl);
+				}
+				break;
+
+			default:
+				st = NULL;
+				break;
+		}
 
 		// save the socket handle
 		(this->conns)[acc->handle].sock   = acc; 
diff --git a/src/stream/read.c b/src/stream/read.c
index 9050e65..f27058d 100644
--- a/src/stream/read.c
+++ b/src/stream/read.c
@@ -40,6 +40,7 @@ streamRead(Stream this, void * buf, size_t count)
 			break;
 
 		default:
+			done = 0;
 			break;
 	}
 
diff --git a/src/stream/write.c b/src/stream/write.c
index 540fade..720f5e4 100644
--- a/src/stream/write.c
+++ b/src/stream/write.c
@@ -40,6 +40,7 @@ streamWrite(Stream this, void * buf, size_t count)
 			break;
 
 		default:
+			done = 0;
 			break;
 	}
 
diff --git a/src/taskrambler.c b/src/taskrambler.c
index 22b28a1..ec8039c 100644
--- a/src/taskrambler.c
+++ b/src/taskrambler.c
@@ -74,8 +74,10 @@ main()
 	init_signals();
 	daemonize();
 
-	shm   = shm_open("/fooshm", O_RDWR|O_CREAT, S_IRWXU);
-	ftruncate(shm, psize);
+	shm = shm_open("/fooshm", O_RDWR|O_CREAT, S_IRWXU);
+	if (-1 == ftruncate(shm, psize)) {
+		doShutdown = 1;
+	}
 
 	switch((pid = fork())) {
 		case -1:
diff --git a/src/utils/daemonize.c b/src/utils/daemonize.c
index 5b1cce3..bab09c8 100644
--- a/src/utils/daemonize.c
+++ b/src/utils/daemonize.c
@@ -26,6 +26,7 @@
 #include <unistd.h>     // for getopt
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56,8 +57,10 @@ void daemonize(void) {
 
     // set umask and change to working directory to /
     umask(UMASK);
-    chdir(PWD);   // this should root and assets needs to be found
-                  // via some kind of configuration.
+    if (-1 == chdir(PWD)) {  // this should root and assets needs to be found
+		perror("daemonize"); // via some kind of configuration.
+		exit(EXIT_FAILURE);
+	}
 
     // we should close all open filedescriptors now.
     // But I assume that this function is called at the very start of the
diff --git a/tests/loggerTest.c b/tests/loggerTest.c
index acf6bff..f018747 100644
--- a/tests/loggerTest.c
+++ b/tests/loggerTest.c
@@ -80,7 +80,9 @@ testLoggerStderr()
 {
     logger = new(LoggerStderr, LOGGER_ERR);
 
-    freopen("/dev/null", "w", stderr);
+    if (NULL == freopen("/dev/null", "w", stderr)) {
+        return TEST_ERROR;
+    }
     loggerLog(logger, LOGGER_ERR, "foo %d %s", 123, "bar");
 
     /**
diff --git a/tests/serverTest.c b/tests/serverTest.c
index 81350d2..9d3bdd9 100644
--- a/tests/serverTest.c
+++ b/tests/serverTest.c
@@ -84,7 +84,9 @@ testDummy()
 			con = new(Sock, logger, TEST_PORT);
 			sleep(1);
 			socketConnect(con, "127.0.0.1", &addr);
-			write(con->handle, TEST_DATA, strlen(TEST_DATA)+1);
+			if(-1 == write(con->handle, TEST_DATA, strlen(TEST_DATA)+1)) {
+				exit(EXIT_FAILURE);
+			}
 			sleep(1);
 			delete(con);
 			__tearDown();