.gitignore

@@ -2,5 +2,3 @@
 /objs/
 /unit_test
 /build*/
-/.cache/
-/compile_commands.json

src/arg_parse.c

@@ -21,14 +21,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-// libc includes.
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
-
-// Posix includes.
-#include <sys/stat.h>
-
 void print_usage(void) {
   puts("Usage:");
   puts("  -p <port> | --port <port>");
@@ -38,7 +30,6 @@ void print_usage(void) {
   puts("    For example: --req-header-to-print=User-Agent");
   puts("    Note that this option is case-insensitive");
   puts("  --enable-reload-config-on-change");
-  puts("  --enable-cache-dir=<DIR>");
 }
 
 Args parse_args(int32_t argc, char **argv) {
@@ -78,38 +69,8 @@ Args parse_args(int32_t argc, char **argv) {
       }
     } else if (strcmp(argv[0], "--enable-reload-config-on-change") == 0) {
       args.flags |= 2;
-    } else if (strncmp(argv[0], "--enable-cache-dir=", 19) == 0) {
-      args.cache_dir = argv[0] + 19;
-      // Check if it actually is an existing directory.
-      DIR *d = opendir(args.cache_dir);
-      if (d == NULL) {
-        if (errno == ENOENT) {
-          printf(
-            "Directory \"%s\" doesn't exist, creating it...\n",
-            args.cache_dir);
-          int ret = mkdir(
-              args.cache_dir,
-              S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
-          if (ret == -1) {
-            fprintf(
-              stderr,
-              "ERROR Failed to create new directory (errno %d)\n",
-              errno);
-            exit(1);
-          }
     } else {
-          fprintf(
+      puts("ERROR: Invalid args!\n");
-            stderr,
-            "ERROR Failed to open directory \"%s\" (errno %d)!\n",
-            args.cache_dir,
-            errno);
-          exit(1);
-        }
-      } else {
-        printf("Directory \"%s\" exists.\n", args.cache_dir);
-      }
-    } else {
-      fprintf(stderr, "ERROR: Invalid args!\n");
       print_usage();
       exit(1);
     }

src/arg_parse.h

@@ -34,9 +34,6 @@ typedef struct Args {
   const char *config_file;
   // Needs to be free'd.
   SDArchiverLinkedList *list_of_headers_to_log;
-  // Non-NULL if cache-dir is specified and cache is to be used.
-  // Does not need to be free'd since it points to a string in argv.
-  const char *cache_dir;
 } Args;
 
 void print_usage(void);

src/http.c

@@ -162,8 +162,7 @@ char *c_simple_http_request_response(
   char *generated_buf = c_simple_http_path_to_generated(
     stripped_path ? stripped_path : request_path,
     templates,
-    &generated_size,
+    &generated_size);
-    NULL); // TODO Use the output parameter "filenames list" here.
 
   if (!generated_buf || generated_size == 0) {
     fprintf(stderr, "ERROR Unable to generate response html for path \"%s\"!\n",

src/http_template.c

@@ -96,14 +96,10 @@ int c_simple_http_internal_ends_with_FILE(const char *c_string) {
 char *c_simple_http_path_to_generated(
     const char *path,
     const C_SIMPLE_HTTP_HTTPTemplates *templates,
-    size_t *output_buf_size,
+    size_t *output_buf_size) {
-    SDArchiverLinkedList **files_list_out) {
   if (output_buf_size) {
     *output_buf_size = 0;
   }
-  if (files_list_out) {
-    *files_list_out = simple_archiver_list_init();
-  }
   size_t path_len_size_t = strlen(path) + 1;
   if (path_len_size_t > 0xFFFFFFFF) {
     fprintf(stderr, "ERROR: Path string is too large!\n");
@@ -143,11 +139,6 @@ char *c_simple_http_path_to_generated(
     }
     html_buf[html_file_size] = 0;
     html_buf_size = (size_t)html_file_size;
-    if (files_list_out) {
-      char *html_filename_copy = malloc(strlen(html_filename) + 1);
-      strcpy(html_filename_copy, html_filename);
-      simple_archiver_list_add(*files_list_out, html_filename_copy, NULL);
-    }
   } else {
     char *stored_html =
       simple_archiver_hash_map_get(wrapped_hash_map->hash_map, "HTML", 5);
@@ -267,12 +258,6 @@ char *c_simple_http_path_to_generated(
                         value_c_str);
                 return NULL;
               }
-              if (files_list_out) {
-                char *variable_filename = malloc(strlen(value_c_str) + 1);
-                strcpy(variable_filename, value_c_str);
-                simple_archiver_list_add(
-                    *files_list_out, variable_filename, NULL);
-              }
             } else {
               // Variable data is "value_c_str".
               template_node =

src/http_template.h

@@ -22,20 +22,14 @@
 // Standard library includes.
 #include <stddef.h>
 
-// Third-party includes.
+// Returns non-NULL on success, which must be free'd after use.
-#include <SimpleArchiver/src/data_structures/linked_list.h>
+// Takes a path string and templates and returns the generated HTML.
-
+// If "output_buf_size" is non-NULL, it will be set to the size of the returned
-// Returns non-NULL on success, which must be free'd after use. Takes a path
+// buffer.
-// string and templates and returns the generated HTML. If "output_buf_size" is
-// non-NULL, it will be set to the size of the returned buffer. If
-// "files_list_out" is non-NULL, then the pointer will be set to a newly
-// allocated linked-list containing filenames used in generating the HTML. This
-// newly allocated linked-list must be freed after use.
 char *c_simple_http_path_to_generated(
   const char *path,
   const C_SIMPLE_HTTP_HTTPTemplates *templates,
-  size_t *output_buf_size,
+  size_t *output_buf_size);
-  SDArchiverLinkedList **files_list_out);
 
 #endif
 

src/test.c

@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 // Local includes.
-#include "SimpleArchiver/src/data_structures/linked_list.h"
 #include "config.h"
 #include "http_template.h"
 #include "http.h"
@@ -90,15 +89,6 @@ void test_internal_cleanup_delete_temporary_file(const char **filename) {
   }
 }
 
-int test_internal_check_matching_string_in_list(void *value, void *ud) {
-  if (value && ud) {
-    if (strcmp(value, ud) == 0) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
 int main(void) {
   // Test config.
   {
@@ -262,18 +252,12 @@ int main(void) {
 
     size_t output_buf_size;
 
-    __attribute__((cleanup(simple_archiver_list_free)))
-    SDArchiverLinkedList *filenames_list = NULL;
-
     __attribute__((cleanup(simple_archiver_helper_cleanup_c_string)))
-    char *buf = c_simple_http_path_to_generated(
+    char *buf = c_simple_http_path_to_generated("/", &config, &output_buf_size);
-        "/", &config, &output_buf_size, &filenames_list);
     ASSERT_TRUE(buf != NULL);
     ASSERT_TRUE(strcmp(buf, "<h1>Test</h1>") == 0);
     CHECK_TRUE(output_buf_size == 13);
-    CHECK_TRUE(filenames_list->count == 0);
     simple_archiver_helper_cleanup_c_string(&buf);
-    simple_archiver_list_free(&filenames_list);
 
     __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
     const char *test_http_template_filename2 =
@@ -304,8 +288,7 @@ int main(void) {
     );
     ASSERT_TRUE(config.paths != NULL);
 
-    buf = c_simple_http_path_to_generated(
+    buf = c_simple_http_path_to_generated("/", &config, &output_buf_size);
-        "/", &config, &output_buf_size, &filenames_list);
     ASSERT_TRUE(buf != NULL);
     printf("%s\n", buf);
     ASSERT_TRUE(
@@ -314,9 +297,7 @@ int main(void) {
         "<h1> Some text. </h1><br><h2> More text. </h2>")
       == 0);
     CHECK_TRUE(output_buf_size == 46);
-    CHECK_TRUE(filenames_list->count == 0);
     simple_archiver_helper_cleanup_c_string(&buf);
-    simple_archiver_list_free(&filenames_list);
 
     __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
     const char *test_http_template_filename3 =
@@ -370,8 +351,7 @@ int main(void) {
     );
     ASSERT_TRUE(config.paths != NULL);
 
-    buf = c_simple_http_path_to_generated(
+    buf = c_simple_http_path_to_generated("/", &config, &output_buf_size);
-        "/", &config, &output_buf_size, &filenames_list);
     ASSERT_TRUE(buf != NULL);
     printf("%s\n", buf);
     ASSERT_TRUE(
@@ -380,14 +360,7 @@ int main(void) {
         "<h1> testVar text. </h1><br><h2> testVar2 text. </h2>")
       == 0);
     CHECK_TRUE(output_buf_size == 53);
-    CHECK_TRUE(filenames_list->count == 1);
-    CHECK_TRUE(simple_archiver_list_get(
-        filenames_list,
-        test_internal_check_matching_string_in_list,
-        (void*)test_http_template_html_filename)
-      != NULL);
     simple_archiver_helper_cleanup_c_string(&buf);
-    simple_archiver_list_free(&filenames_list);
 
     __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
     const char *test_http_template_filename4 =
@@ -461,8 +434,7 @@ int main(void) {
     );
     ASSERT_TRUE(config.paths != NULL);
 
-    buf = c_simple_http_path_to_generated(
+    buf = c_simple_http_path_to_generated("/", &config, &output_buf_size);
-        "/", &config, &output_buf_size, &filenames_list);
     ASSERT_TRUE(buf != NULL);
     printf("%s\n", buf);
     ASSERT_TRUE(
@@ -471,17 +443,6 @@ int main(void) {
         "<h1> some test text in test var file. </h1>")
       == 0);
     CHECK_TRUE(output_buf_size == 43);
-    CHECK_TRUE(filenames_list->count == 2);
-    CHECK_TRUE(simple_archiver_list_get(
-        filenames_list,
-        test_internal_check_matching_string_in_list,
-        (void*)test_http_template_html_filename2)
-      != NULL);
-    CHECK_TRUE(simple_archiver_list_get(
-        filenames_list,
-        test_internal_check_matching_string_in_list,
-        (void*)test_http_template_html_var_filename)
-      != NULL);
     simple_archiver_helper_cleanup_c_string(&buf);
   }