Refactoring: 2nd step and a working state.

1 files changed, 8 insertions, 6 deletions

diff --git a/main.c b/main.c
index 906be15..96cfa67 100644
--- a/main.c
+++ b/main.c
@@ -46,7 +46,7 @@ static int read_everything(FILE * f_r, FILE * output) {
                         continue;
                 }
 
-                fwrite(read_buffer, read_buffer_length, 1, output);
+                fwrite(read_buffer, 1, size, output);
 
                 if (read_buffer_length > POST_DATA_MAX_LENGTH)
                         return EXIT_FAILURE;
@@ -67,7 +67,10 @@ static void * answer_request(size_t new_socket) {
         FILE * output = open_memstream(&output_buffer, &output_buffer_length);
 
         read_everything(f_r, output);  // TODO: catch return value and error handling
-        shutdown(new_socket, SHUT_RD); // shutdown the reading half of the connection
+        fflush(output);
+        // shutdown(new_socket, SHUT_RD); // shutdown the reading half of the connection
+
+        DEBUG("output buffer has a length of %ld bytes\n", output_buffer_length);
 
         // TODO: make parsing function abstract (e.g. parse(...) function point with dlsym)
         parse_http(new_socket, output_buffer, output_buffer_length);
@@ -80,8 +83,8 @@ static void * answer_request(size_t new_socket) {
         return NULL;
 }
 
-
 int become_daemon(const char * name) {
+#       ifndef DEBUG // debugging is simpler in foreground mode
         if(fork()) {
                 exit(EXIT_SUCCESS);
         } else {
@@ -90,12 +93,12 @@ int become_daemon(const char * name) {
                         exit(EXIT_SUCCESS);
                 } else {
                         syslog(0, "daemon '%s' is running with pid %d", name, getpid());
-                        return EXIT_SUCCESS;
                 }
         }
+# endif
+        return EXIT_SUCCESS;
 }
 
-
 static int serve(int server_fd)
 {
         struct sockaddr_in address;
@@ -129,7 +132,6 @@ int main(const int argc, char const * argv[]) {
         int port = atoi(argc > 1 ? argv[1] : "8080");
         0 == port ? port = 8080 : port;
 
-
         struct sockaddr_in address = {
                 .sin_family      = AF_INET,
                 .sin_addr.s_addr = INADDR_ANY,