Version 1.5

Update third-party submodule SimpleArchiver
Update Changelog.md
2024-11-25 17:39:04 +09:00 · 2024-11-25 17:23:17 +09:00 · 2024-11-25 16:04:44 +09:00 · 2024-11-25 16:01:49 +09:00 · 2024-11-25 14:21:00 +09:00 · 2024-11-25 14:20:28 +09:00
20 changed files with 1657 additions and 223 deletions
--- a/.forgejo/workflows/build_releases.yaml
+++ b/.forgejo/workflows/build_releases.yaml
@ -172,6 +172,8 @@ jobs:
            cmake -S . -B buildRelease -DCMAKE_BUILD_TYPE=Release
            make -C buildRelease c_simple_http

+            strip --strip-unneeded buildRelease/c_simple_http
+
            popd >&/dev/null
            zstd --ultra -20 c_simple_http_clone/buildRelease/c_simple_http -o "${BUILD_ASSET_NAME}"

@ -233,6 +235,8 @@ jobs:
            cmake -S . -B buildRelease -DCMAKE_BUILD_TYPE=Release
            make -C buildRelease c_simple_http

+            strip --strip-unneeded buildRelease/c_simple_http
+
            popd >&/dev/null
            zstd --ultra -20 c_simple_http_clone/buildRelease/c_simple_http -o "${BUILD_ASSET_NAME}"

--- a/Changelog.md
+++ b/Changelog.md
@ -2,6 +2,64 @@

 ## Upcoming Changes

+## Version 1.5
+
+Add flag `--generate-static-enable-overwrite`. This flag enables overwriting of
+files from static-dir to generate-dir (if static-dir was specified). Previous
+implementation relied on `--generate-enable-ovewrite` for this behavior.
+
+Minor refactorings related to `printf` and `uintX_t`/`size_t` types.
+
+## Version 1.4
+
+Implemented "IF", "ELSEIF", "ELSE", "ENDIF", and "INDEX" for templates.
+
+IF is used like: `{{{!IF Variable==SomeString}}}`.  
+Not equals can also be used: `{{{!IF Variable!=OtherString}}}`.  
+ELSEIF is used like: `{{{!ELSEIF Variable==AnotherString}}}`.  
+Not equals can also be used: `{{{!ELSEIF Variable!=AnotherOtherString}}}`.  
+ELSE is used like: `{{{!ELSE}}}`.  
+ENDIF is used like: `{{{!ENDIF}}}`.  
+INDEX is used like: `{{{!INDEX ArrayVar[2]}}}`.
+
+Implemented "FOREACH" and "ENDFOREACH" for templates.
+
+FOREACH is used like:
+
+    PATH=/
+    HTML='''
+        {{{!FOREACH ArrayVar}}}
+            {{{ArrayVar}}}
+        {{{!ENDFOREACH}}}'''
+    ArrayVar=FirstValue
+    ArrayVar=SecondValue
+    ArrayVar=ThirdValue
+
+For multiple variables to expand in FOREACH:
+
+    PATH=/
+    HTML='''
+        {{{!FOREACH ArrayVar!ArrayVarSecond!ArrayVarThird}}}
+            {{{ArrayVar}}}
+            {{{ArrayVarSecond}}}
+            {{{ArrayVarThird}}}
+        {{{!ENDFOREACH}}}'''
+    ArrayVar=FirstVarOnce
+    ArrayVar=FirstVarTwice
+    ArrayVarSecond=SecondVarOnce
+    ArrayVarSecond=SecondVarTwice
+    ArrayVarThird=ThirdVarOnce
+    ArrayVarThird=ThirdVarTwice
+
+Implemented nestable "IF" and "FOREACH" expressions in templates. In other
+words, there can be `{{{!IF}}}` inside other IF/FOREACH blocks, and vice versa.
+
+## Version 1.3
+
+Fix internal erronous buffer declaration.
+
+Fix internal missing NULL check.
+
 ## Version 1.2

 Add the `--generate-dir=<DIR>` option, which will generate all html into the
@ -29,3 +87,7 @@ Features:
  - Reload configuration on SIGUSR1 or by listening (enabled by cmd parameter).
  - Cache served html (enabled by cmd parameter).
  - Serve static files from "static-dir" (enabled by cmd parameter).
+
+<!--
+    vim: textwidth=80 et sw=2 ts=2 sts=2
+-->
--- a/README.md
+++ b/README.md
@ -17,6 +17,7 @@ A simple HTTP/1.1 server written in C.
      --enable-static-dir=<DIR>
      --generate-dir=<DIR>
      --generate-enable-overwrite
+      --generate-static-enable-overwrite

 ## Changelog

--- a/example_config/each_file_one.html
+++ b/example_config/each_file_one.html
@ -0,0 +1 @@
+<b>Each File ONE</b><br>
--- a/example_config/each_file_two.html
+++ b/example_config/each_file_two.html
@ -0,0 +1 @@
+<b>Each File TWO</b><br>
--- a/example_config/each_file_zero.html
+++ b/example_config/each_file_zero.html
@ -0,0 +1 @@
+<b>Each File ZERO</b><br>
--- a/example_config/example.config
+++ b/example_config/example.config
@ -25,13 +25,130 @@ HTML='''
  </style>
  </head>
 <body>
-  <h1>Test HTML</h1><br>
-  <h2>{{{Var}}}</h2>
-  <h3><a href="/inner">To inner.</a></h3>
+<h2>Test IF/FOREACH Expr</h2>
+
+Outer IF<br>
+<pre>
+{{{!IF ThisValue==true}}}
+  ThisValue is <b>true</b>.<br>
+  {{{!FOREACH ArrayValue}}}
+    {{{!IF ThisOtherValue==true}}}
+      {{{ArrayValue}}}<br>
+      ThisOtherValue is <b>true</b>.<br>
+      {{{Var}}}<br>
+    {{{!ELSE}}}
+      {{{ArrayValue}}}<br>
+      ThisOtherValue is <b>NOT true</b>.<br>
+      {{{Var}}}<br>
+    {{{!ENDIF}}}
+  {{{!ENDFOREACH}}}
+{{{!ELSE}}}
+  ThisValue is <b>NOT true</b>.<br>
+  {{{!FOREACH ArrayValueSecond}}}
+    {{{!IF ThisOtherValue==true}}}
+      {{{ArrayValueSecond}}}<br>
+      ThisOtherValue is <b>true</b>.<br>
+      {{{Var}}}<br>
+    {{{!ELSE}}}
+      {{{ArrayValueSecond}}}<br>
+      ThisOtherValue is <b>NOT true</b>.<br>
+      {{{Var}}}<br>
+    {{{!ENDIF}}}
+  {{{!ENDFOREACH}}}
+{{{!ENDIF}}}
+</pre><br>
+
+Outer FOREACH<br>
+<pre>
+{{{!FOREACH ArrayValue}}}
+  {{{ArrayValue}}}<br>
+  {{{!IF ThisValue==true}}}
+    ThisValue is <b>true</b>.<br>
+    {{{!FOREACH ArrayValueSecond}}}
+      {{{ArrayValueSecond}}}<br>
+      {{{!IF ThisOtherValue==true}}}
+        ThisOtherValue is <b>true</b>.<br>
+        {{{Var}}}<br>
+      {{{!ELSE}}}
+        ThisOtherValue is <b>NOT true</b>.<br>
+        {{{Var}}}<br>
+      {{{!ENDIF}}}
+    {{{!ENDFOREACH}}}
+  {{{!ELSE}}}
+    ThisValue is <b>NOT true</b>.<br>
+    {{{!FOREACH ArrayValueSecond}}}
+      {{{ArrayValueSecond}}}<br>
+      {{{!IF ThisOtherValue==true}}}
+        ThisOtherValue is <b>true</b>.<br>
+        {{{Var}}}<br>
+      {{{!ELSE}}}
+        ThisOtherValue is <b>NOT true</b>.<br>
+        {{{Var}}}<br>
+      {{{!ENDIF}}}
+    {{{!ENDFOREACH}}}
+  {{{!ENDIF}}}
+{{{!ENDFOREACH}}}
+</pre><br>
+
+Nested FOREACH:<br>
+<pre>
+{{{!FOREACH ArrayValue}}}
+  {{{ArrayValue}}}
+  {{{!FOREACH ArrayValueSecond}}}
+    {{{ArrayValueSecond}}}
+    {{{!FOREACH ArrayValueThird}}}
+      {{{ArrayValueThird}}}
+      {{{!FOREACH ArrayValueFourth}}}
+        {{{ArrayValueFourth}}}
+        {{{!FOREACH Each_FILE}}}
+          {{{Each_FILE}}}
+        {{{!ENDFOREACH}}}
+      {{{!ENDFOREACH}}}
+    {{{!ENDFOREACH}}}
+  {{{!ENDFOREACH}}}
+{{{!ENDFOREACH}}}
+</pre>
+
+<br><h2><a href="/inner">inner</a></h2>
 </body>
+</html>
 '''

 Var='''Test var value'''
+ThisValue=true
+ThisOtherValue=true
+
+ArrayValue=1_IDX_Zero
+ArrayValue=1_IDX_One
+ArrayValue=1_IDX_Two
+
+ArrayValueSecond=2_IDX_Zero
+ArrayValueSecond=2_IDX_One
+ArrayValueSecond=2_IDX_Two
+
+ArrayValueThird=3_IDX_Zero
+ArrayValueThird=3_IDX_One
+ArrayValueThird=3_IDX_Two
+
+ArrayValueFourth=4_IDX_Zero
+ArrayValueFourth=4_IDX_One
+ArrayValueFourth=4_IDX_Two
+
+EachTestHead='''First Entry Head'''
+EachTestMid='''First Entry Mid'''
+EachTestTail='''First Entry Tail'''
+
+EachTestHead='''Second Entry Head'''
+EachTestMid='''Second Entry Mid'''
+EachTestTail='''Second Entry Tail'''
+
+EachTestHead='''Third Entry Head'''
+EachTestMid='''Third Entry Mid'''
+EachTestTail='''Third Entry Tail'''
+
+Each_FILE='''example_config/each_file_zero.html'''
+Each_FILE='''example_config/each_file_one.html'''
+Each_FILE='''example_config/each_file_two.html'''

 PATH=/inner
 HTML_FILE='''example_config/inner.html'''
--- a/src/arg_parse.c
+++ b/src/arg_parse.c
@ -46,6 +46,7 @@ void print_usage(void) {
  puts("  --enable-static-dir=<DIR>");
  puts("  --generate-dir=<DIR>");
  puts("  --generate-enable-overwrite");
+  puts("  --generate-static-enable-overwrite");
 }

 Args parse_args(int32_t argc, char **argv) {
@ -128,7 +129,7 @@ Args parse_args(int32_t argc, char **argv) {
        exit(1);
      } else {
        printf(
-          "NOTICE set cache-entry-lifetime to %lu\n",
+          "NOTICE set cache-entry-lifetime to %zu\n",
          args.cache_lifespan_seconds);
      }
    } else if (strncmp(argv[0], "--enable-static-dir=", 20) == 0) {
@ -184,9 +185,13 @@ Args parse_args(int32_t argc, char **argv) {
      } else {
        printf("Directory \"%s\" exists.\n", args.generate_dir);
      }
+      if (d) {
        closedir(d);
+      }
    } else if (strcmp(argv[0], "--generate-enable-overwrite") == 0) {
      args.flags |= 4;
+    } else if (strcmp(argv[0], "--generate-static-enable-overwrite") == 0) {
+      args.flags |= 8;
    } else {
      fprintf(stderr, "ERROR: Invalid args!\n");
      print_usage();
--- a/src/arg_parse.h
+++ b/src/arg_parse.h
@ -29,6 +29,7 @@ typedef struct Args {
  // xxxx xx0x - disable listen on config file for reloading.
  // xxxx xx1x - enable listen on config file for reloading.
  // xxxx x1xx - enable overwrite on generate.
+  // xxxx 1xxx - enable overwrite on generate for static dir.
  uint16_t flags;
  uint16_t port;
  // Does not need to be free'd, this should point to a string in argv.
--- a/src/config.c
+++ b/src/config.c
@ -36,6 +36,23 @@ typedef struct C_SIMPLE_HTTP_INTERNAL_RequiredCheck {
  const SDArchiverLinkedList *required;
 } C_SIMPLE_HTTP_INTERNAL_RequiredCheck;

+void c_simple_http_cleanup_config_value(
+    C_SIMPLE_HTTP_ConfigValue *config_value) {
+  if (config_value) {
+    if (config_value->next) {
+      c_simple_http_cleanup_config_value(config_value->next);
+    }
+    if(config_value->value) {
+      free(config_value->value);
+    }
+    free(config_value);
+  }
+}
+
+void c_simple_http_cleanup_config_value_void_ptr(void *config_value) {
+  c_simple_http_cleanup_config_value(config_value);
+}
+
 int c_simple_http_required_iter_fn(void *data, void *ud) {
  C_SIMPLE_HTTP_INTERNAL_RequiredIter *req_iter_struct = ud;
  uint32_t data_str_length = (uint32_t)strlen(data) + 1;
@ -187,13 +204,17 @@ int internal_check_add_value(uint32_t *state,
    SDArchiverHashMap *hash_map = simple_archiver_hash_map_init();
    unsigned char *key = malloc(separating_key_size);
    strncpy((char*)key, separating_key, separating_key_size);
-    unsigned char *value = malloc(*value_idx);
-    memcpy(value, *value_buf, (*value_idx));
-    if (simple_archiver_hash_map_insert(hash_map,
-                                        value,
+    C_SIMPLE_HTTP_ConfigValue *config_value =
+      malloc(sizeof(C_SIMPLE_HTTP_ConfigValue));
+    config_value->value = malloc(*value_idx);
+    config_value->next = NULL;
+    memcpy(config_value->value, *value_buf, (*value_idx));
+    if (simple_archiver_hash_map_insert(
+        hash_map,
+        config_value,
        key,
        separating_key_size,
-                                        NULL,
+        c_simple_http_cleanup_config_value_void_ptr,
        NULL) != 0) {
      fprintf(stderr,
        "ERROR: Failed to create hash map for new separating_key "
@ -201,7 +222,8 @@ int internal_check_add_value(uint32_t *state,
      c_simple_http_clean_up_parsed_config(config);
      config->hash_map = NULL;
      free(key);
-      free(value);
+      free(config_value->value);
+      free(config_value);
      return 1;
    }

@ -212,7 +234,7 @@ int internal_check_add_value(uint32_t *state,
    if (simple_archiver_hash_map_insert(
        config->hash_map,
        wrapper,
-        value,
+        config_value->value,
        (*value_idx),
        c_simple_http_hash_map_wrapper_cleanup_hashmap_fn,
        simple_archiver_helper_datastructure_cleanup_nop) != 0) {
@ -223,7 +245,7 @@ int internal_check_add_value(uint32_t *state,
      c_simple_http_hash_map_wrapper_cleanup(wrapper);
      return 1;
    }
-    simple_archiver_list_add(paths, value,
+    simple_archiver_list_add(paths, config_value->value,
        simple_archiver_helper_datastructure_cleanup_nop);
  } else if (!(*current_separating_key_value)) {
    fprintf(
@ -254,11 +276,27 @@ int internal_check_add_value(uint32_t *state,
    unsigned char *value = malloc(*value_idx);
    memcpy(value, *value_buf, (*value_idx));

-    if (simple_archiver_hash_map_insert(hash_map_wrapper->paths,
-                                        value,
+    // Check if key already exists in wrapped hash-map.
+    C_SIMPLE_HTTP_ConfigValue *config_value =
+      simple_archiver_hash_map_get(hash_map_wrapper->paths, key, *key_idx);
+    if (config_value) {
+      while(config_value->next) {
+        config_value = config_value->next;
+      }
+      config_value->next = malloc(sizeof(C_SIMPLE_HTTP_ConfigValue));
+      config_value->next->value = (char*)value;
+      config_value->next->next = NULL;
+      free(key);
+    } else {
+      config_value = malloc(sizeof(C_SIMPLE_HTTP_ConfigValue));
+      config_value->value = (char*)value;
+      config_value->next = NULL;
+      if (simple_archiver_hash_map_insert(
+          hash_map_wrapper->paths,
+          config_value,
          key,
          *key_idx,
-                                        NULL,
+          c_simple_http_cleanup_config_value_void_ptr,
          NULL) != 0) {
        fprintf(stderr,
          "ERROR: Internal error failed to insert into hash map with path "
@ -270,6 +308,7 @@ int internal_check_add_value(uint32_t *state,
        return 1;
      }
    }
+  }
  (*key_idx) = 0;
  (*value_idx) = 0;
  return 0;
--- a/src/config.h
+++ b/src/config.h
@ -30,6 +30,9 @@ typedef struct C_SIMPLE_HTTP_ParsedConfig {
  /// KEY: "/", VALUE: HashMapWrapper struct
  /// KEY: "/inner", VALUE: HashMapWrapper struct
  /// KEY: "/inner/further", VALUE: HashMapWrapper struct
+  ///
+  /// Each HashMapWrapper struct's hash-map has the following:
+  /// KEY: VAR_NAME, VALUE: ConfigValue struct
  union {
    SDArchiverHashMap *paths;
    SDArchiverHashMap *hash_map;
@ -38,6 +41,15 @@ typedef struct C_SIMPLE_HTTP_ParsedConfig {

 typedef C_SIMPLE_HTTP_ParsedConfig C_SIMPLE_HTTP_HashMapWrapper;

+typedef struct C_SIMPLE_HTTP_ConfigValue {
+  char *value;
+  struct C_SIMPLE_HTTP_ConfigValue *next;
+} C_SIMPLE_HTTP_ConfigValue;
+
+void c_simple_http_cleanup_config_value(
+  C_SIMPLE_HTTP_ConfigValue *config_value);
+void c_simple_http_cleanup_config_value_void_ptr(void *config_value);
+
 /// Each line in the config should be a key-value pair separated by an equals
 /// sign "=". All whitespace is ignored unless if the value is "quoted". A part
 /// of a string can be "quoted" if it is surrounded by three single-quotes or
--- a/src/helpers.c
+++ b/src/helpers.c
@ -17,6 +17,7 @@
 #include "helpers.h"

 // Standard library includes.
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@ -31,7 +32,9 @@ int c_simple_http_internal_get_string_part_full_size(void *data, void *ud) {
  C_SIMPLE_HTTP_String_Part *part = data;
  size_t *count = ud;

+  if (part->size > 0) {
    *count += part->size - 1;
+  }

  return 0;
 }
@ -86,9 +89,36 @@ void c_simple_http_add_string_part(
  C_SIMPLE_HTTP_String_Part *string_part =
    malloc(sizeof(C_SIMPLE_HTTP_String_Part));

+  if (c_string) {
    string_part->size = strlen(c_string) + 1;
    string_part->buf = malloc(string_part->size);
    memcpy(string_part->buf, c_string, string_part->size);
+  } else {
+    string_part->size = 0;
+    string_part->buf = NULL;
+  }
+
+  string_part->extra = extra;
+  simple_archiver_list_add(
+    list, string_part, c_simple_http_cleanup_string_part);
+}
+
+void c_simple_http_add_string_part_sized(
+    SDArchiverLinkedList *list,
+    const char *buffer,
+    size_t size,
+    uintptr_t extra) {
+  C_SIMPLE_HTTP_String_Part *string_part =
+    malloc(sizeof(C_SIMPLE_HTTP_String_Part));
+
+  if (buffer && size > 0) {
+    string_part->size = size;
+    string_part->buf = malloc(string_part->size - 1);
+    memcpy(string_part->buf, buffer, string_part->size - 1);
+  } else {
+    string_part->size = 0;
+    string_part->buf = NULL;
+  }

  string_part->extra = extra;

@ -264,4 +294,66 @@ void c_simple_http_cleanup_DIR(DIR **fd) {
  }
 }

+char *c_simple_http_FILE_to_c_str(const char *filename, uint64_t *size_out) {
+  FILE *fd = fopen(filename, "rb");
+  if (!fd) {
+    fprintf(stderr, "ERROR Failed to open %s!\n", filename);
+    return NULL;
+  } else if (fseek(fd, 0, SEEK_END) != 0) {
+    fprintf(stderr, "ERROR Failed to seek to end of %s!\n", filename);
+    fclose(fd);
+    return NULL;
+  }
+
+  long size = ftell(fd);
+  if (size < 0) {
+    fprintf(stderr, "ERROR Failed to get seek pos of end of %s!\n", filename);
+    fclose(fd);
+    return NULL;
+  } else if (size == 0) {
+    fprintf(stderr, "ERROR Size of file \"%s\" is zero!\n", filename);
+    fclose(fd);
+    return NULL;
+  }
+  if (size_out) {
+    *size_out = (uint64_t)size;
+  }
+  char *buf = malloc((uint64_t)size + 1);
+  if (fseek(fd, 0, SEEK_SET) != 0) {
+    fprintf(stderr, "ERROR Failed to seek to beginning of %s!\n", filename);
+    free(buf);
+    fclose(fd);
+    return NULL;
+  } else if (fread(buf, 1, (uint64_t)size, fd) != (uint64_t)size) {
+    fprintf(stderr, "ERROR Failed to read from file %s!\n", filename);
+    free(buf);
+    fclose(fd);
+    return NULL;
+  }
+
+  buf[size] = 0;
+
+  fclose(fd);
+  return buf;
+}
+
+size_t c_simple_http_trim_end_whitespace(char *c_str) {
+  size_t trimmed = 0;
+
+  uint64_t idx= strlen(c_str);
+  for (; idx-- > 0;) {
+    if (c_str[idx] == ' '
+        || c_str[idx] == '\n'
+        || c_str[idx] == '\r'
+        || c_str[idx] == '\t') {
+      c_str[idx] = 0;
+      ++trimmed;
+    } else {
+      break;
+    }
+  }
+
+  return trimmed;
+}
+
 // vim: et ts=2 sts=2 sw=2
--- a/src/helpers.h
+++ b/src/helpers.h
@ -56,6 +56,16 @@ void c_simple_http_cleanup_string_part(void *data);
 void c_simple_http_add_string_part(
  SDArchiverLinkedList *list, const char *c_string, uintptr_t extra);

+/// Puts a malloced instance of String_Part into the list.
+/// The given c_string will be copied into a newly malloced buffer.
+/// "size" must include NULL if "buffer" is a c_string.
+/// If there is no NULL at the end, "size" must be +1 actual size.
+void c_simple_http_add_string_part_sized(
+  SDArchiverLinkedList *list,
+  const char *buffer,
+  size_t size,
+  uintptr_t extra);
+
 /// Combines all String_Parts in the list and returns it as a single buffer.
 char *c_simple_http_combine_string_parts(const SDArchiverLinkedList *list);

@ -80,6 +90,13 @@ int c_simple_http_helper_mkdir_tree(const char *dirpath);

 void c_simple_http_cleanup_DIR(DIR **fd);

+/// Must be free'd if non-NULL.
+char *c_simple_http_FILE_to_c_str(const char *filename, uint64_t *size_out);
+
+/// Trims by placing NULL bytes in place of whitespace at the end of c_str.
+/// Returns number of whitespace trimmed.
+size_t c_simple_http_trim_end_whitespace(char *c_str);
+
 #endif

 // vim: et ts=2 sts=2 sw=2
--- a/src/html_cache.c
+++ b/src/html_cache.c
@ -38,8 +38,12 @@
 #include "helpers.h"
 #include "http_template.h"

-int c_simple_http_internal_write_filenames_to_cache_file(void *data, void *ud) {
-  char *filename = data;
+int c_simple_http_internal_write_filenames_to_cache_file(
+    const void *key,
+    __attribute__((unused)) size_t key_size,
+    __attribute__((unused)) const void *value,
+    void *ud) {
+  const char *filename = key;
  FILE *cache_fd = ud;

  const size_t filename_size = strlen(filename);
@ -436,8 +440,8 @@ CACHE_FILE_WRITE_CHECK:
      return -5;
    }

-    __attribute__((cleanup(simple_archiver_list_free)))
-    SDArchiverLinkedList *used_filenames = NULL;
+    __attribute__((cleanup(simple_archiver_hash_map_free)))
+    SDArchiverHashMap *used_filenames = NULL;

    size_t generated_html_size = 0;

@ -452,10 +456,10 @@ CACHE_FILE_WRITE_CHECK:
      return -4;
    }

-    if (simple_archiver_list_get(
+    if (simple_archiver_hash_map_iter(
          used_filenames,
          c_simple_http_internal_write_filenames_to_cache_file,
-        cache_fd)) {
+          cache_fd) != 0) {
      fprintf(stderr, "ERROR Failed to write filenames to cache file!\n");
      return -6;
    } else if (fwrite("--- BEGIN HTML ---\n", 1, 19, cache_fd) != 19) {
--- a/src/http_template.c
+++ b/src/http_template.c
--- a/src/http_template.h
+++ b/src/http_template.h
@ -17,13 +17,16 @@
 #ifndef SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_TEMPLATE_H_
 #define SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_TEMPLATE_H_

-#include "http.h"

 // Standard library includes.
 #include <stddef.h>

 // Third-party includes.
 #include <SimpleArchiver/src/data_structures/linked_list.h>
+#include <SimpleArchiver/src/data_structures/hash_map.h>
+
+// Local includes.
+#include "http.h"

 // Returns non-NULL on success, which must be free'd after use. Takes a path
 // string and templates and returns the generated HTML. If "output_buf_size" is
@ -35,7 +38,7 @@ char *c_simple_http_path_to_generated(
  const char *path,
  const C_SIMPLE_HTTP_HTTPTemplates *templates,
  size_t *output_buf_size,
-  SDArchiverLinkedList **files_list_out);
+  SDArchiverHashMap **files_set_out);

 #endif

--- a/src/main.c
+++ b/src/main.c
@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <inttypes.h>

 // Linux/Unix includes.
 #include <sys/socket.h>
@ -232,7 +233,7 @@ int c_simple_http_manage_connections(void *data, void *ud) {
    snprintf(
      content_length_buf + content_length_buf_size,
      127 - content_length_buf_size,
-      "%lu\n%n",
+      "%zu\n%n",
      response_size,
      &written);
    if (written <= 0) {
@ -304,7 +305,7 @@ int c_simple_http_manage_connections(void *data, void *ud) {
      snprintf(
        content_length_buf,
        content_str_len + 1 + 16 + 1,
-        "Content-Length: %lu\n",
+        "Content-Length: %" PRIu64 "\n",
        file_info.buf_size);
      CHECK_ERROR_WRITE_NO_FD(write(
        citem->fd, content_length_buf, content_str_len + 1 + 16));
@ -363,7 +364,7 @@ int main(int argc, char **argv) {
      puts("Static dir option specified, copying over static dir entries...");
      if (c_simple_http_static_copy_over_dir(args.static_dir,
                                             args.generate_dir,
-                                             (args.flags & 4) != 0 ? 1 : 0)
+                                             (args.flags & 8) != 0 ? 1 : 0)
          != 0) {
        fprintf(stderr, "ERROR during static-dir-entires copying!\n");
        return 1;
@ -385,7 +386,8 @@ int main(int argc, char **argv) {
    socklen_t size = sizeof(ipv6_addr);
    int ret = getsockname(tcp_socket, (struct sockaddr*)&ipv6_addr, &size);
    if (ret == 0) {
-      printf("Listening on port: %u\n", u16_be_swap(ipv6_addr.sin6_port));
+      printf("Listening on port: %" PRIu16 "\n",
+             u16_be_swap(ipv6_addr.sin6_port));
    } else {
      fprintf(
        stderr,
@ -462,7 +464,7 @@ int main(int argc, char **argv) {
        ++config_try_reload_attempts;
        fprintf(
          stderr,
-          "Attempting to reload config now (try %u of %u)...\n",
+          "Attempting to reload config now (try %" PRIu32 " of %u)...\n",
          config_try_reload_attempts,
          C_SIMPLE_HTTP_TRY_CONFIG_RELOAD_MAX_ATTEMPTS);
        C_SIMPLE_HTTP_ParsedConfig new_parsed_config =
@ -532,7 +534,7 @@ int main(int argc, char **argv) {
        }
      } else if (read_ret > 0) {
 #ifndef NDEBUG
-        printf("DEBUG inotify_event->mask: %x\n", inotify_event->mask);
+        printf("DEBUG inotify_event->mask: %" PRIx32 "\n", inotify_event->mask);
 #endif
        if ((inotify_event->mask & IN_MODIFY) != 0
            || (inotify_event->mask & IN_CLOSE_WRITE) != 0) {
--- a/src/static.c
+++ b/src/static.c
@ -421,8 +421,8 @@ int c_simple_http_static_copy_over_dir(const char *from,
        if (fd) {
          fprintf(
            stderr,
-            "WARNING \"%s\" already exists and --generate-enable-overwrite not "
-              "specified, skipping!\n",
+            "WARNING \"%s\" already exists and "
+              "--generate-static-enable-overwrite not specified, skipping!\n",
            combined_to);
          continue;
        }
@ -458,7 +458,7 @@ int c_simple_http_static_copy_over_dir(const char *from,
        return 1;
      }

-      char *buf[1024];
+      char buf[1024];
      size_t fread_ret;
      unsigned long fwrite_ret;
      while (!feof(from_file_fd)
--- a/src/test.c
+++ b/src/test.c
@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <inttypes.h>

 // POSIX includes.
 #include <unistd.h>
@ -28,7 +29,10 @@ static int32_t checks_passed = 0;

 #define RETURN() \
  do { \
-    fprintf(stderr, "checked %d\npassed  %d\n", checks_checked, checks_passed);\
+    fprintf(stderr, \
+            "checked %" PRId32 "\npassed  %" PRId32 "\n", \
+            checks_checked, \
+            checks_passed); \
    return checks_checked == checks_passed ? 0 : 1; \
  } while (0);

@ -99,9 +103,13 @@ 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) {
+int test_internal_check_matching_string_in_list(
+    const void *key,
+    __attribute__((unused)) size_t key_size,
+    __attribute__((unused)) const void *value,
+    void *ud) {
+  if (key && ud) {
+    if (strcmp(key, ud) == 0) {
      return 1;
    }
  }
@ -173,46 +181,53 @@ int main(int argc, char **argv) {
      simple_archiver_hash_map_get(templates.paths, "/", 2);
    ASSERT_TRUE(first_path_map_wrapper);

-    const char *value =
+    C_SIMPLE_HTTP_ConfigValue *value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "PATH", 5);
    ASSERT_TRUE(value);
-    ASSERT_STREQ(value, "/");
+    ASSERT_TRUE(value->value);
+    ASSERT_STREQ(value->value, "/");

    value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "HTML", 5);
    ASSERT_TRUE(value);
+    ASSERT_TRUE(value->value);
    // printf("%s\n", value);
-    ASSERT_STREQ(value, " one two three ");
+    ASSERT_STREQ(value->value, " one two three ");

    value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST", 5);
    ASSERT_TRUE(value);
+    ASSERT_TRUE(value->value);
    // printf("%s\n", value);
-    ASSERT_STREQ(value, " \"one two \"three ");
+    ASSERT_STREQ(value->value, " \"one two \"three ");

    value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST2", 6);
    ASSERT_TRUE(value);
+    ASSERT_TRUE(value->value);
    // printf("%s\n", value);
-    ASSERT_STREQ(value, "'\"onetwo\"three''");
+    ASSERT_STREQ(value->value, "'\"onetwo\"three''");

    value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST3", 6);
    ASSERT_TRUE(value);
+    ASSERT_TRUE(value->value);
    // printf("%s\n", value);
-    ASSERT_STREQ(value, " \"one two \"three ''");
+    ASSERT_STREQ(value->value, " \"one two \"three ''");

    value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST4", 6);
    ASSERT_TRUE(value);
+    ASSERT_TRUE(value->value);
    // printf("%s\n", value);
-    ASSERT_STREQ(value, " \"\"\"one two \"\"\"three ");
+    ASSERT_STREQ(value->value, " \"\"\"one two \"\"\"three ");

    value =
      simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST5", 6);
    ASSERT_TRUE(value);
+    ASSERT_TRUE(value->value);
    // printf("%s\n", value);
-    ASSERT_STREQ(value, " '''one two '''three ");
+    ASSERT_STREQ(value->value, " '''one two '''three ");

    simple_archiver_list_free(&required_names);
    required_names = simple_archiver_list_init();
@ -271,18 +286,18 @@ int main(int argc, char **argv) {

    size_t output_buf_size;

-    __attribute__((cleanup(simple_archiver_list_free)))
-    SDArchiverLinkedList *filenames_list = NULL;
+    __attribute__((cleanup(simple_archiver_hash_map_free)))
+    SDArchiverHashMap *filenames_set = NULL;

    __attribute__((cleanup(simple_archiver_helper_cleanup_c_string)))
    char *buf = c_simple_http_path_to_generated(
-        "/", &config, &output_buf_size, &filenames_list);
+        "/", &config, &output_buf_size, &filenames_set);
    ASSERT_TRUE(buf != NULL);
    ASSERT_TRUE(strcmp(buf, "<h1>Test</h1>") == 0);
    CHECK_TRUE(output_buf_size == 13);
-    CHECK_TRUE(filenames_list->count == 0);
+    CHECK_TRUE(filenames_set->count == 0);
    simple_archiver_helper_cleanup_c_string(&buf);
-    simple_archiver_list_free(&filenames_list);
+    simple_archiver_hash_map_free(&filenames_set);

    __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
    const char *test_http_template_filename2 =
@ -314,7 +329,7 @@ int main(int argc, char **argv) {
    ASSERT_TRUE(config.paths != NULL);

    buf = c_simple_http_path_to_generated(
-        "/", &config, &output_buf_size, &filenames_list);
+        "/", &config, &output_buf_size, &filenames_set);
    ASSERT_TRUE(buf != NULL);
    //printf("%s\n", buf);
    ASSERT_TRUE(
@ -323,9 +338,9 @@ int main(int argc, char **argv) {
        "<h1> Some text. </h1><br><h2> More text. </h2>")
      == 0);
    CHECK_TRUE(output_buf_size == 46);
-    CHECK_TRUE(filenames_list->count == 0);
+    CHECK_TRUE(filenames_set->count == 0);
    simple_archiver_helper_cleanup_c_string(&buf);
-    simple_archiver_list_free(&filenames_list);
+    simple_archiver_hash_map_free(&filenames_set);

    __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
    const char *test_http_template_filename3 =
@ -380,7 +395,7 @@ int main(int argc, char **argv) {
    ASSERT_TRUE(config.paths != NULL);

    buf = c_simple_http_path_to_generated(
-        "/", &config, &output_buf_size, &filenames_list);
+        "/", &config, &output_buf_size, &filenames_set);
    ASSERT_TRUE(buf != NULL);
    //printf("%s\n", buf);
    ASSERT_TRUE(
@ -389,14 +404,14 @@ int main(int argc, char **argv) {
        "<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,
+    CHECK_TRUE(filenames_set->count == 1);
+    CHECK_TRUE(simple_archiver_hash_map_iter(
+        filenames_set,
        test_internal_check_matching_string_in_list,
        (void*)test_http_template_html_filename)
-      != NULL);
+      != 0);
    simple_archiver_helper_cleanup_c_string(&buf);
-    simple_archiver_list_free(&filenames_list);
+    simple_archiver_hash_map_free(&filenames_set);

    __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
    const char *test_http_template_filename4 =
@ -471,7 +486,7 @@ int main(int argc, char **argv) {
    ASSERT_TRUE(config.paths != NULL);

    buf = c_simple_http_path_to_generated(
-        "/", &config, &output_buf_size, &filenames_list);
+        "/", &config, &output_buf_size, &filenames_set);
    ASSERT_TRUE(buf != NULL);
    //printf("%s\n", buf);
    ASSERT_TRUE(
@ -480,17 +495,17 @@ int main(int argc, char **argv) {
        "<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,
+    CHECK_TRUE(filenames_set->count == 2);
+    CHECK_TRUE(simple_archiver_hash_map_iter(
+        filenames_set,
        test_internal_check_matching_string_in_list,
        (void*)test_http_template_html_filename2)
-      != NULL);
-    CHECK_TRUE(simple_archiver_list_get(
-        filenames_list,
+      != 0);
+    CHECK_TRUE(simple_archiver_hash_map_iter(
+        filenames_set,
        test_internal_check_matching_string_in_list,
        (void*)test_http_template_html_var_filename)
-      != NULL);
+      != 0);
    simple_archiver_helper_cleanup_c_string(&buf);
  }

@ -613,6 +628,46 @@ int main(int argc, char **argv) {
    CHECK_TRUE(ret == 0);
    CHECK_TRUE(ret2 == 0);
    CHECK_TRUE(ret3 == 0);
+
+    buf = strdup("EndingWithThreeTabs\t\t\t");
+    CHECK_TRUE(c_simple_http_trim_end_whitespace(buf) == 3);
+    CHECK_TRUE(buf[18] == 's');
+    CHECK_TRUE(buf[19] == 0);
+    CHECK_TRUE(buf[20] == 0);
+    CHECK_TRUE(buf[21] == 0);
+    CHECK_TRUE(buf[22] == 0);
+    free(buf);
+    buf = NULL;
+
+    buf = strdup("EndingWithThreeSpaces   ");
+    CHECK_TRUE(c_simple_http_trim_end_whitespace(buf) == 3);
+    CHECK_TRUE(buf[20] == 's');
+    CHECK_TRUE(buf[21] == 0);
+    CHECK_TRUE(buf[22] == 0);
+    CHECK_TRUE(buf[23] == 0);
+    CHECK_TRUE(buf[24] == 0);
+    free(buf);
+    buf = NULL;
+
+    buf = strdup("EndingWithThreeNewlines\n\n\n");
+    CHECK_TRUE(c_simple_http_trim_end_whitespace(buf) == 3);
+    CHECK_TRUE(buf[22] == 's');
+    CHECK_TRUE(buf[23] == 0);
+    CHECK_TRUE(buf[24] == 0);
+    CHECK_TRUE(buf[25] == 0);
+    CHECK_TRUE(buf[26] == 0);
+    free(buf);
+    buf = NULL;
+
+    buf = strdup("EndingWithThreeCarraigeReturns\r\r\r");
+    CHECK_TRUE(c_simple_http_trim_end_whitespace(buf) == 3);
+    CHECK_TRUE(buf[29] == 's');
+    CHECK_TRUE(buf[30] == 0);
+    CHECK_TRUE(buf[31] == 0);
+    CHECK_TRUE(buf[32] == 0);
+    CHECK_TRUE(buf[33] == 0);
+    free(buf);
+    buf = NULL;
  }

  // Test html_cache.
--- a/third_party/SimpleArchiver
+++ b/third_party/SimpleArchiver
@ -1 +1 @@
-Subproject commit b256350fbcf170ef3d70e9cf7c6dfa0618e47ef4
+Subproject commit 78a36b48dbd3888f56e26ac71115e5f775a74c2c
Author	SHA1	Message	Date
Stephen Seo	cfa7a065b2	Version 1.5 All checks were successful Build for Releases / ensure-release-exists (push) Successful in 3s Details Build for Releases / push-build-x86_64 (push) Successful in 6s Details Run Unit Tests / build-and-run-unit-tests (push) Successful in 2m9s Details Build for Releases / push-build-aarch64 (push) Successful in 1m15s Details Build for Releases / push-build-x86_64_debian (push) Successful in 34s Details Build for Releases / push-build-aarch64_debian (push) Successful in 5m15s Details	2024-11-25 17:39:04 +09:00
Stephen Seo	ca5296920c	Update third-party submodule SimpleArchiver All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 20s Details	2024-11-25 17:23:17 +09:00
Stephen Seo	faa0c457d9	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 2m9s Details	2024-11-25 16:04:44 +09:00
Stephen Seo	d6edaa3bdd	Use proper format constants for size_t/uintX_t etc All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 22s Details	2024-11-25 16:01:49 +09:00
Stephen Seo	0ecb8d6801	Update README.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 22s Details	2024-11-25 14:21:00 +09:00
Stephen Seo	8052e693e6	Update Changelog.md	2024-11-25 14:20:28 +09:00
Stephen Seo	a467cceb90	Add separate flag for generate-static overwrite Previous implementation allowed static files to overwrite existing files on generate if static-dir was specified and generate-enable-overwrite was specified. Now, an additional flag "--generate-static-enable-overwrite" determines if static-dir files overwrite on generate.	2024-11-25 14:17:32 +09:00
Stephen Seo	8e58873ea9	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 22s Details	2024-11-21 21:05:11 +09:00
Stephen Seo	2d485a3824	Version 1.4 All checks were successful Build for Releases / ensure-release-exists (push) Successful in 3s Details Run Unit Tests / build-and-run-unit-tests (push) Successful in 20s Details Build for Releases / push-build-x86_64 (push) Successful in 6s Details Build for Releases / push-build-aarch64 (push) Successful in 17s Details Build for Releases / push-build-x86_64_debian (push) Successful in 36s Details Build for Releases / push-build-aarch64_debian (push) Successful in 5m29s Details	2024-11-21 14:14:09 +09:00
Stephen Seo	3fc301cde5	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 22s Details	2024-11-21 14:06:09 +09:00
Stephen Seo	82693bfa3e	Ensure http_template.c keeps track of _FILE files	2024-11-21 14:05:33 +09:00
Stephen Seo	e6e9fc16af	More testing of nested FOREACH in example_config All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 2m10s Details	2024-11-20 17:12:10 +09:00
Stephen Seo	fddc43f36b	More notes about FOREACH in Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 23s Details	2024-11-20 16:21:28 +09:00
Stephen Seo	10bf88ec3e	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 25s Details	2024-11-20 16:16:25 +09:00
Stephen Seo	20f413c8d9	Impl. nested FOREACH expressions All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 37s Details IF/ELSEIF/ELSE/ENDIF and FOREACH/ENDFOREACH can now be nested in each other in HTML templates. TODO: Cleanup/refactorings, properly set up "files_map".	2024-11-20 16:12:58 +09:00
Stephen Seo	5e2ae5f87b	Fix Unit Tests whilst keeping FOREACH working All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 21s Details	2024-11-19 21:26:42 +09:00
Stephen Seo	d46a323b15	Impl. FOREACH and NOTFOREACH Some checks failed Run Unit Tests / build-and-run-unit-tests (push) Failing after 4s Details TODO: Figure out nested FOREACH or abandon that feature.	2024-11-19 20:53:11 +09:00
Stephen Seo	e9de2682f6	Refactoring related to `{{{!IF}}}...`	2024-11-19 15:07:40 +09:00
Stephen Seo	12a1edc897	Allow nested `{{{!IF}}}...`, fixes All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 20s Details	2024-11-18 20:10:45 +09:00
Stephen Seo	63a5eca63c	Fix memory leak for array variables All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 2m7s Details	2024-11-18 17:41:26 +09:00
Stephen Seo	ba1c692e2f	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 23s Details	2024-11-18 17:10:41 +09:00
Stephen Seo	8da223461d	Impl. extension of template delimeter expressions Implemented "IF", "ELSEIF", "ELSE", "ENDIF", and "INDEX" for templates. IF is used like: `{{{!IF Variable==SomeString}}}`. ELSEIF is used like: `{{{!ELSEIF Variable==AnotherString}}}`. ELSE is used like: `{{{!ELSE}}}`. ENDIF is used like: `{{{!ENDIF}}}`. INDEX is used like: `{{{!INDEX ArrayVar[2]}}}`.	2024-11-18 17:07:07 +09:00
Stephen Seo	d9d286c53f	Refactor template handling Split off some code into separate function to be updated for support for more template features.	2024-11-18 13:11:13 +09:00
Stephen Seo	08769d026e	Update third-party submodule SimpleArchiver All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 22s Details	2024-11-15 17:42:26 +09:00
Stephen Seo	2c82b82b06	Allow "multi-valued-key-entries" in ParsedConfig All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 25s Details This commit begins work on adding more templating features.	2024-11-15 16:28:31 +09:00
Stephen Seo	35aa5fc5a3	Update Changelog.md, Bump version 1.3 All checks were successful Build for Releases / ensure-release-exists (push) Successful in 4s Details Run Unit Tests / build-and-run-unit-tests (push) Successful in 22s Details Build for Releases / push-build-x86_64 (push) Successful in 6s Details Build for Releases / push-build-aarch64 (push) Successful in 1m11s Details Build for Releases / push-build-aarch64_debian (push) Successful in 5m25s Details Build for Releases / push-build-x86_64_debian (push) Successful in 28s Details	2024-11-14 10:41:43 +09:00
Stephen Seo	6e9f0709b4	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 20s Details	2024-11-12 17:26:33 +09:00
Stephen Seo	b056a8f99d	Add missing NULL check in arg_parse.c Previous implementation didn't crash because `closedir(...)` is lenient.	2024-11-12 17:25:52 +09:00
Stephen Seo	1b683f3395	Update Changelog.md All checks were successful Run Unit Tests / build-and-run-unit-tests (push) Successful in 21s Details	2024-11-12 17:18:21 +09:00
Stephen Seo	33be6c49fd	Fix erronous buffer declaration	2024-11-12 17:16:58 +09:00
Stephen Seo	cdacfc106d	Add `strip --strip-unneeded` to debian builds (ci) All checks were successful Build for Releases / ensure-release-exists (push) Successful in 3s Details Build for Releases / push-build-x86_64 (push) Successful in 6s Details Build for Releases / push-build-aarch64 (push) Successful in 1m12s Details Build for Releases / push-build-x86_64_debian (push) Successful in 33s Details Build for Releases / push-build-aarch64_debian (push) Successful in 2m5s Details Run Unit Tests / build-and-run-unit-tests (push) Successful in 2m0s Details	2024-11-12 13:49:19 +09:00