Refactoring, stable&functional intermediate state

1 files changed, 5 insertions, 11 deletions

diff --git a/cgi.c b/cgi.c
index aa86c9a..128eae7 100644
--- a/cgi.c
+++ b/cgi.c
@@ -81,9 +81,7 @@ int print_on_correct_printer(void * user_data, unsigned flags, cups_dest_t * des
         return 0;
 }
 
-void send_answer_file(Http_Header * http_header, int fd_socket) {
-
-        FILE * f = fdopen((size_t) fd_socket, "w");
+void send_answer_file(Http_Header * http_header, FILE * f) {
         fputs("HTTP/1.0 200 OK\n", f);
         fputs("content-type: text/html\n\n", f);
         fflush(f);
@@ -96,23 +94,20 @@ void send_answer_file(Http_Header * http_header, int fd_socket) {
                 for(;;) {
                         read_size = fread(buffer, 1, BUFFER_SIZE, file);
                         fwrite(buffer, 1, read_size, f);
-                        fflush(f);
                         if(feof(file))
                                 break;
                 }
         } else {
-                if(http_header->url) // TODO: too dangerous to check that here, that is too late.
                         fprintf(f, "could not open file \"%s\"\n", &http_header->url[1]);
         }
 
-        fflush(f);
-        fclose(f);
         return;
 }
 
-void send_answer(Http_Header * http_header, int fd_socket) {
+void send_answer(Http_Header * http_header, FILE * f) {
+
+        char * printer_name = "Brother_QL-720NW"; // TODO: make configurable
 
-        char * printer_name = "Brother_QL-720NW";
         cupsEnumDests(CUPS_DEST_FLAGS_NONE,
                         0,
                         NULL,
@@ -124,8 +119,7 @@ void send_answer(Http_Header * http_header, int fd_socket) {
         line1 = NULL;
         line2 = NULL;
 
-        http_header->url = "/index.html";
-        send_answer_file(http_header, fd_socket);
+        send_answer_file(http_header, f);
 }