stephenseo/c_simple_http
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Compare commits

base: stephenseo:main
Branches Tags
stephenseo:main
stephenseo:dev
stephenseo:1.4
stephenseo:1.3
stephenseo:1.2
stephenseo:1.1
stephenseo:1.0
..
compare: stephenseo:1.3
Branches Tags
stephenseo:dev
stephenseo:main
stephenseo:1.4
stephenseo:1.3
stephenseo:1.2
stephenseo:1.1
stephenseo:1.0

No commits in common. "main" and "1.3" have entirely different histories.
main ... 1.3

14 changed files with 211 additions and 1610 deletions
Show stats Expand all files Collapse all files

44
Changelog.md
View file

@ -2,50 +2,6 @@
## Upcoming Changes ## Upcoming Changes
## 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 ## Version 1.3
Fix internal erronous buffer declaration. Fix internal erronous buffer declaration.

1
example_config/each_file_one.html
View file

@ -1 +0,0 @@
<b>Each File ONE</b><br>

1
example_config/each_file_two.html
View file

@ -1 +0,0 @@
<b>Each File TWO</b><br>

1
example_config/each_file_zero.html
View file

@ -1 +0,0 @@
<b>Each File ZERO</b><br>

129
example_config/example.config
View file

@ -1,6 +1,6 @@
PATH=/ PATH=/
HTML=''' HTML='''
<html> <html>
<head> <head>
<style> <style>
body { body {
@ -24,131 +24,14 @@ HTML='''
} }
</style> </style>
</head> </head>
<body> <body>
<h2>Test IF/FOREACH Expr</h2> <h1>Test HTML</h1><br>
<h2>{{{Var}}}</h2>
Outer IF<br> <h3><a href="/inner">To inner.</a></h3>
<pre> </body>
{{{!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''' 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 PATH=/inner
HTML_FILE='''example_config/inner.html''' HTML_FILE='''example_config/inner.html'''

87
src/config.c
View file

@ -36,23 +36,6 @@ typedef struct C_SIMPLE_HTTP_INTERNAL_RequiredCheck {
const SDArchiverLinkedList *required; const SDArchiverLinkedList *required;
} C_SIMPLE_HTTP_INTERNAL_RequiredCheck; } 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) { int c_simple_http_required_iter_fn(void *data, void *ud) {
C_SIMPLE_HTTP_INTERNAL_RequiredIter *req_iter_struct = ud; C_SIMPLE_HTTP_INTERNAL_RequiredIter *req_iter_struct = ud;
uint32_t data_str_length = (uint32_t)strlen(data) + 1; uint32_t data_str_length = (uint32_t)strlen(data) + 1;
@ -204,26 +187,21 @@ int internal_check_add_value(uint32_t *state,
SDArchiverHashMap *hash_map = simple_archiver_hash_map_init(); SDArchiverHashMap *hash_map = simple_archiver_hash_map_init();
unsigned char *key = malloc(separating_key_size); unsigned char *key = malloc(separating_key_size);
strncpy((char*)key, separating_key, separating_key_size); strncpy((char*)key, separating_key, separating_key_size);
C_SIMPLE_HTTP_ConfigValue *config_value = unsigned char *value = malloc(*value_idx);
malloc(sizeof(C_SIMPLE_HTTP_ConfigValue)); memcpy(value, *value_buf, (*value_idx));
config_value->value = malloc(*value_idx); if (simple_archiver_hash_map_insert(hash_map,
config_value->next = NULL; value,
memcpy(config_value->value, *value_buf, (*value_idx)); key,
if (simple_archiver_hash_map_insert( separating_key_size,
hash_map, NULL,
config_value, NULL) != 0) {
key,
separating_key_size,
c_simple_http_cleanup_config_value_void_ptr,
NULL) != 0) {
fprintf(stderr, fprintf(stderr,
"ERROR: Failed to create hash map for new separating_key " "ERROR: Failed to create hash map for new separating_key "
"block!\n"); "block!\n");
c_simple_http_clean_up_parsed_config(config); c_simple_http_clean_up_parsed_config(config);
config->hash_map = NULL; config->hash_map = NULL;
free(key); free(key);
free(config_value->value); free(value);
free(config_value);
return 1; return 1;
} }
@ -234,7 +212,7 @@ int internal_check_add_value(uint32_t *state,
if (simple_archiver_hash_map_insert( if (simple_archiver_hash_map_insert(
config->hash_map, config->hash_map,
wrapper, wrapper,
config_value->value, value,
(*value_idx), (*value_idx),
c_simple_http_hash_map_wrapper_cleanup_hashmap_fn, c_simple_http_hash_map_wrapper_cleanup_hashmap_fn,
simple_archiver_helper_datastructure_cleanup_nop) != 0) { simple_archiver_helper_datastructure_cleanup_nop) != 0) {
@ -245,7 +223,7 @@ int internal_check_add_value(uint32_t *state,
c_simple_http_hash_map_wrapper_cleanup(wrapper); c_simple_http_hash_map_wrapper_cleanup(wrapper);
return 1; return 1;
} }
simple_archiver_list_add(paths, config_value->value, simple_archiver_list_add(paths, value,
simple_archiver_helper_datastructure_cleanup_nop); simple_archiver_helper_datastructure_cleanup_nop);
} else if (!(*current_separating_key_value)) { } else if (!(*current_separating_key_value)) {
fprintf( fprintf(
@ -276,37 +254,20 @@ int internal_check_add_value(uint32_t *state,
unsigned char *value = malloc(*value_idx); unsigned char *value = malloc(*value_idx);
memcpy(value, *value_buf, (*value_idx)); memcpy(value, *value_buf, (*value_idx));
// Check if key already exists in wrapped hash-map. if (simple_archiver_hash_map_insert(hash_map_wrapper->paths,
C_SIMPLE_HTTP_ConfigValue *config_value = value,
simple_archiver_hash_map_get(hash_map_wrapper->paths, key, *key_idx); key,
if (config_value) { *key_idx,
while(config_value->next) { NULL,
config_value = config_value->next; NULL) != 0) {
} fprintf(stderr,
config_value->next = malloc(sizeof(C_SIMPLE_HTTP_ConfigValue)); "ERROR: Internal error failed to insert into hash map with path "
config_value->next->value = (char*)value; "\"%s\"!", (*current_separating_key_value));
config_value->next->next = NULL; c_simple_http_clean_up_parsed_config(config);
config->hash_map = NULL;
free(key); free(key);
} else { free(value);
config_value = malloc(sizeof(C_SIMPLE_HTTP_ConfigValue)); return 1;
config_value->value = (char*)value;
config_value->next = NULL;
if (simple_archiver_hash_map_insert(
hash_map_wrapper->paths,
config_value,
key,
*key_idx,
c_simple_http_cleanup_config_value_void_ptr,
NULL) != 0) {
fprintf(stderr,
"ERROR: Internal error failed to insert into hash map with path "
"\"%s\"!", (*current_separating_key_value));
c_simple_http_clean_up_parsed_config(config);
config->hash_map = NULL;
free(key);
free(value);
return 1;
}
} }
} }
(*key_idx) = 0; (*key_idx) = 0;

12
src/config.h
View file

@ -30,9 +30,6 @@ typedef struct C_SIMPLE_HTTP_ParsedConfig {
/// KEY: "/", VALUE: HashMapWrapper struct /// KEY: "/", VALUE: HashMapWrapper struct
/// KEY: "/inner", VALUE: HashMapWrapper struct /// KEY: "/inner", VALUE: HashMapWrapper struct
/// KEY: "/inner/further", 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 { union {
SDArchiverHashMap *paths; SDArchiverHashMap *paths;
SDArchiverHashMap *hash_map; SDArchiverHashMap *hash_map;
@ -41,15 +38,6 @@ typedef struct C_SIMPLE_HTTP_ParsedConfig {
typedef C_SIMPLE_HTTP_ParsedConfig C_SIMPLE_HTTP_HashMapWrapper; 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 /// 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 /// 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 /// of a string can be "quoted" if it is surrounded by three single-quotes or

100
src/helpers.c
View file

@ -17,7 +17,6 @@
#include "helpers.h" #include "helpers.h"
// Standard library includes. // Standard library includes.
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -32,9 +31,7 @@ int c_simple_http_internal_get_string_part_full_size(void *data, void *ud) {
C_SIMPLE_HTTP_String_Part *part = data; C_SIMPLE_HTTP_String_Part *part = data;
size_t *count = ud; size_t *count = ud;
if (part->size > 0) { *count += part->size - 1;
*count += part->size - 1;
}
return 0; return 0;
} }
@ -89,36 +86,9 @@ void c_simple_http_add_string_part(
C_SIMPLE_HTTP_String_Part *string_part = C_SIMPLE_HTTP_String_Part *string_part =
malloc(sizeof(C_SIMPLE_HTTP_String_Part)); malloc(sizeof(C_SIMPLE_HTTP_String_Part));
if (c_string) { string_part->size = strlen(c_string) + 1;
string_part->size = strlen(c_string) + 1; string_part->buf = malloc(string_part->size);
string_part->buf = malloc(string_part->size); memcpy(string_part->buf, c_string, 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; string_part->extra = extra;
@ -294,66 +264,4 @@ 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 // vim: et ts=2 sts=2 sw=2

17
src/helpers.h
View file

@ -56,16 +56,6 @@ void c_simple_http_cleanup_string_part(void *data);
void c_simple_http_add_string_part( void c_simple_http_add_string_part(
SDArchiverLinkedList *list, const char *c_string, uintptr_t extra); 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. /// Combines all String_Parts in the list and returns it as a single buffer.
char *c_simple_http_combine_string_parts(const SDArchiverLinkedList *list); char *c_simple_http_combine_string_parts(const SDArchiverLinkedList *list);
@ -90,13 +80,6 @@ int c_simple_http_helper_mkdir_tree(const char *dirpath);
void c_simple_http_cleanup_DIR(DIR **fd); 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 #endif
// vim: et ts=2 sts=2 sw=2 // vim: et ts=2 sts=2 sw=2

20
src/html_cache.c
View file

@ -38,12 +38,8 @@
#include "helpers.h" #include "helpers.h"
#include "http_template.h" #include "http_template.h"
int c_simple_http_internal_write_filenames_to_cache_file( int c_simple_http_internal_write_filenames_to_cache_file(void *data, void *ud) {
const void *key, char *filename = data;
__attribute__((unused)) size_t key_size,
__attribute__((unused)) const void *value,
void *ud) {
const char *filename = key;
FILE *cache_fd = ud; FILE *cache_fd = ud;
const size_t filename_size = strlen(filename); const size_t filename_size = strlen(filename);
@ -440,8 +436,8 @@ CACHE_FILE_WRITE_CHECK:
return -5; return -5;
} }
__attribute__((cleanup(simple_archiver_hash_map_free))) __attribute__((cleanup(simple_archiver_list_free)))
SDArchiverHashMap *used_filenames = NULL; SDArchiverLinkedList *used_filenames = NULL;
size_t generated_html_size = 0; size_t generated_html_size = 0;
@ -456,10 +452,10 @@ CACHE_FILE_WRITE_CHECK:
return -4; return -4;
} }
if (simple_archiver_hash_map_iter( if (simple_archiver_list_get(
used_filenames, used_filenames,
c_simple_http_internal_write_filenames_to_cache_file, c_simple_http_internal_write_filenames_to_cache_file,
cache_fd) != 0) { cache_fd)) {
fprintf(stderr, "ERROR Failed to write filenames to cache file!\n"); fprintf(stderr, "ERROR Failed to write filenames to cache file!\n");
return -6; return -6;
} else if (fwrite("--- BEGIN HTML ---\n", 1, 19, cache_fd) != 19) { } else if (fwrite("--- BEGIN HTML ---\n", 1, 19, cache_fd) != 19) {

1283
src/http_template.c
View file

File diff suppressed because it is too large Load diff

7
src/http_template.h
View file

@ -17,16 +17,13 @@
#ifndef SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_TEMPLATE_H_ #ifndef SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_TEMPLATE_H_
#define SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_TEMPLATE_H_ #define SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_TEMPLATE_H_
#include "http.h"
// Standard library includes. // Standard library includes.
#include <stddef.h> #include <stddef.h>
// Third-party includes. // Third-party includes.
#include <SimpleArchiver/src/data_structures/linked_list.h> #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 // 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 // string and templates and returns the generated HTML. If "output_buf_size" is
@ -38,7 +35,7 @@ char *c_simple_http_path_to_generated(
const char *path, const char *path,
const C_SIMPLE_HTTP_HTTPTemplates *templates, const C_SIMPLE_HTTP_HTTPTemplates *templates,
size_t *output_buf_size, size_t *output_buf_size,
SDArchiverHashMap **files_set_out); SDArchiverLinkedList **files_list_out);
#endif #endif

117
src/test.c
View file

@ -99,13 +99,9 @@ void test_internal_cleanup_delete_temporary_file(const char **filename) {
} }
} }
int test_internal_check_matching_string_in_list( int test_internal_check_matching_string_in_list(void *value, void *ud) {
const void *key, if (value && ud) {
__attribute__((unused)) size_t key_size, if (strcmp(value, ud) == 0) {
__attribute__((unused)) const void *value,
void *ud) {
if (key && ud) {
if (strcmp(key, ud) == 0) {
return 1; return 1;
} }
} }
@ -177,53 +173,46 @@ int main(int argc, char **argv) {
simple_archiver_hash_map_get(templates.paths, "/", 2); simple_archiver_hash_map_get(templates.paths, "/", 2);
ASSERT_TRUE(first_path_map_wrapper); ASSERT_TRUE(first_path_map_wrapper);
C_SIMPLE_HTTP_ConfigValue *value = const char *value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "PATH", 5); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "PATH", 5);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value); ASSERT_STREQ(value, "/");
ASSERT_STREQ(value->value, "/");
value = value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "HTML", 5); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "HTML", 5);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value);
// printf("%s\n", value); // printf("%s\n", value);
ASSERT_STREQ(value->value, " one two three "); ASSERT_STREQ(value, " one two three ");
value = value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST", 5); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST", 5);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value);
// printf("%s\n", value); // printf("%s\n", value);
ASSERT_STREQ(value->value, " \"one two \"three "); ASSERT_STREQ(value, " \"one two \"three ");
value = value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST2", 6); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST2", 6);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value);
// printf("%s\n", value); // printf("%s\n", value);
ASSERT_STREQ(value->value, "'\"onetwo\"three''"); ASSERT_STREQ(value, "'\"onetwo\"three''");
value = value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST3", 6); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST3", 6);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value);
// printf("%s\n", value); // printf("%s\n", value);
ASSERT_STREQ(value->value, " \"one two \"three ''"); ASSERT_STREQ(value, " \"one two \"three ''");
value = value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST4", 6); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST4", 6);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value);
// printf("%s\n", value); // printf("%s\n", value);
ASSERT_STREQ(value->value, " \"\"\"one two \"\"\"three "); ASSERT_STREQ(value, " \"\"\"one two \"\"\"three ");
value = value =
simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST5", 6); simple_archiver_hash_map_get(first_path_map_wrapper->paths, "TEST5", 6);
ASSERT_TRUE(value); ASSERT_TRUE(value);
ASSERT_TRUE(value->value);
// printf("%s\n", value); // printf("%s\n", value);
ASSERT_STREQ(value->value, " '''one two '''three "); ASSERT_STREQ(value, " '''one two '''three ");
simple_archiver_list_free(&required_names); simple_archiver_list_free(&required_names);
required_names = simple_archiver_list_init(); required_names = simple_archiver_list_init();
@ -282,18 +271,18 @@ int main(int argc, char **argv) {
size_t output_buf_size; size_t output_buf_size;
__attribute__((cleanup(simple_archiver_hash_map_free))) __attribute__((cleanup(simple_archiver_list_free)))
SDArchiverHashMap *filenames_set = NULL; SDArchiverLinkedList *filenames_list = NULL;
__attribute__((cleanup(simple_archiver_helper_cleanup_c_string))) __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, &filenames_set); "/", &config, &output_buf_size, &filenames_list);
ASSERT_TRUE(buf != NULL); ASSERT_TRUE(buf != NULL);
ASSERT_TRUE(strcmp(buf, "<h1>Test</h1>") == 0); ASSERT_TRUE(strcmp(buf, "<h1>Test</h1>") == 0);
CHECK_TRUE(output_buf_size == 13); CHECK_TRUE(output_buf_size == 13);
CHECK_TRUE(filenames_set->count == 0); CHECK_TRUE(filenames_list->count == 0);
simple_archiver_helper_cleanup_c_string(&buf); simple_archiver_helper_cleanup_c_string(&buf);
simple_archiver_hash_map_free(&filenames_set); simple_archiver_list_free(&filenames_list);
__attribute__((cleanup(test_internal_cleanup_delete_temporary_file))) __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
const char *test_http_template_filename2 = const char *test_http_template_filename2 =
@ -325,7 +314,7 @@ int main(int argc, char **argv) {
ASSERT_TRUE(config.paths != NULL); ASSERT_TRUE(config.paths != NULL);
buf = c_simple_http_path_to_generated( buf = c_simple_http_path_to_generated(
"/", &config, &output_buf_size, &filenames_set); "/", &config, &output_buf_size, &filenames_list);
ASSERT_TRUE(buf != NULL); ASSERT_TRUE(buf != NULL);
//printf("%s\n", buf); //printf("%s\n", buf);
ASSERT_TRUE( ASSERT_TRUE(
@ -334,9 +323,9 @@ int main(int argc, char **argv) {
"<h1> Some text. </h1><br><h2> More text. </h2>") "<h1> Some text. </h1><br><h2> More text. </h2>")
== 0); == 0);
CHECK_TRUE(output_buf_size == 46); CHECK_TRUE(output_buf_size == 46);
CHECK_TRUE(filenames_set->count == 0); CHECK_TRUE(filenames_list->count == 0);
simple_archiver_helper_cleanup_c_string(&buf); simple_archiver_helper_cleanup_c_string(&buf);
simple_archiver_hash_map_free(&filenames_set); simple_archiver_list_free(&filenames_list);
__attribute__((cleanup(test_internal_cleanup_delete_temporary_file))) __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
const char *test_http_template_filename3 = const char *test_http_template_filename3 =
@ -391,7 +380,7 @@ int main(int argc, char **argv) {
ASSERT_TRUE(config.paths != NULL); ASSERT_TRUE(config.paths != NULL);
buf = c_simple_http_path_to_generated( buf = c_simple_http_path_to_generated(
"/", &config, &output_buf_size, &filenames_set); "/", &config, &output_buf_size, &filenames_list);
ASSERT_TRUE(buf != NULL); ASSERT_TRUE(buf != NULL);
//printf("%s\n", buf); //printf("%s\n", buf);
ASSERT_TRUE( ASSERT_TRUE(
@ -400,14 +389,14 @@ int main(int argc, char **argv) {
"<h1> testVar text. </h1><br><h2> testVar2 text. </h2>") "<h1> testVar text. </h1><br><h2> testVar2 text. </h2>")
== 0); == 0);
CHECK_TRUE(output_buf_size == 53); CHECK_TRUE(output_buf_size == 53);
CHECK_TRUE(filenames_set->count == 1); CHECK_TRUE(filenames_list->count == 1);
CHECK_TRUE(simple_archiver_hash_map_iter( CHECK_TRUE(simple_archiver_list_get(
filenames_set, filenames_list,
test_internal_check_matching_string_in_list, test_internal_check_matching_string_in_list,
(void*)test_http_template_html_filename) (void*)test_http_template_html_filename)
!= 0); != NULL);
simple_archiver_helper_cleanup_c_string(&buf); simple_archiver_helper_cleanup_c_string(&buf);
simple_archiver_hash_map_free(&filenames_set); simple_archiver_list_free(&filenames_list);
__attribute__((cleanup(test_internal_cleanup_delete_temporary_file))) __attribute__((cleanup(test_internal_cleanup_delete_temporary_file)))
const char *test_http_template_filename4 = const char *test_http_template_filename4 =
@ -482,7 +471,7 @@ int main(int argc, char **argv) {
ASSERT_TRUE(config.paths != NULL); ASSERT_TRUE(config.paths != NULL);
buf = c_simple_http_path_to_generated( buf = c_simple_http_path_to_generated(
"/", &config, &output_buf_size, &filenames_set); "/", &config, &output_buf_size, &filenames_list);
ASSERT_TRUE(buf != NULL); ASSERT_TRUE(buf != NULL);
//printf("%s\n", buf); //printf("%s\n", buf);
ASSERT_TRUE( ASSERT_TRUE(
@ -491,17 +480,17 @@ int main(int argc, char **argv) {
"<h1> some test text in test var file. </h1>") "<h1> some test text in test var file. </h1>")
== 0); == 0);
CHECK_TRUE(output_buf_size == 43); CHECK_TRUE(output_buf_size == 43);
CHECK_TRUE(filenames_set->count == 2); CHECK_TRUE(filenames_list->count == 2);
CHECK_TRUE(simple_archiver_hash_map_iter( CHECK_TRUE(simple_archiver_list_get(
filenames_set, filenames_list,
test_internal_check_matching_string_in_list, test_internal_check_matching_string_in_list,
(void*)test_http_template_html_filename2) (void*)test_http_template_html_filename2)
!= 0); != NULL);
CHECK_TRUE(simple_archiver_hash_map_iter( CHECK_TRUE(simple_archiver_list_get(
filenames_set, filenames_list,
test_internal_check_matching_string_in_list, test_internal_check_matching_string_in_list,
(void*)test_http_template_html_var_filename) (void*)test_http_template_html_var_filename)
!= 0); != NULL);
simple_archiver_helper_cleanup_c_string(&buf); simple_archiver_helper_cleanup_c_string(&buf);
} }
@ -624,46 +613,6 @@ int main(int argc, char **argv) {
CHECK_TRUE(ret == 0); CHECK_TRUE(ret == 0);
CHECK_TRUE(ret2 == 0); CHECK_TRUE(ret2 == 0);
CHECK_TRUE(ret3 == 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. // Test html_cache.

2
third_party/SimpleArchiver vendored

@ -1 +1 @@
Subproject commit ce7400a298a95b60d0d482058ed9eae4142f8061 Subproject commit b256350fbcf170ef3d70e9cf7c6dfa0618e47ef4