Use existing file

3 files changed, 15 insertions, 18 deletions

diff --git a/.hgignore b/.hgignore
index 5c59a2f..d2b5499 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,7 +1,6 @@
 syntax: glob
 
 a.out
-a.txt
 
 build/
 
diff --git a/a.txt b/a.txt
new file mode 100644
index 0000000..2e65efe
--- /dev/null
+++ b/a.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/response_generation_sendfile.c b/response_generation_sendfile.c
index 46e4389..c94ed96 100644
--- a/response_generation_sendfile.c
+++ b/response_generation_sendfile.c
@@ -25,29 +25,26 @@ answer_to_connection (void *cls,
         struct MHD_Response *response;
         int ret;
         int fd;
-        static int aptr;
         if ((0 != strcmp (method, MHD_HTTP_METHOD_GET)) &&
             (0 != strcmp (method, MHD_HTTP_METHOD_HEAD)))
                 return MHD_NO;
-        FILE *fp;
-        if ((fp = fopen ("a.txt", "w")) == NULL)
-                return 1;
-        fprintf (fp, "a");
-        fclose (fp);
-        const char *file = "./a.txt";
-        if ((fd = open (file, O_RDONLY)) == -1)
-                return 1;
+        if ((-1 == (fd = open ("a.txt", O_RDONLY))) || (0 != fstat (fd, &buf)))
+        {
+                if (fd != -1)
+                        close (fd);
+                return 1; // error
+        }
         response = MHD_create_response_from_fd64 (buf.st_size, fd);
-        //if (NULL == response)
-        //{
-        //      if (0 != close (fd))
-        //              abort ();
-        //      return MHD_NO;
-        //}
+        if (NULL == response)
+        {
+                if (0 != close (fd))
+                        abort ();
+                return MHD_NO;
+        }
         ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
         MHD_destroy_response (response);
-        //if (MHD_NO == ret)
-        //      abort ();
+        if (MHD_NO == ret)
+                abort ();
         return ret;
 }