diff --git a/baked.c b/baked.c index ce2d6d8..b53e8c8 100644 --- a/baked.c +++ b/baked.c @@ -5,3 +5,6 @@ #include "baked.h" INCBIN(gpp1, "gpp1"); + +INCBIN(tmpl_home, "./tmpls/home.t"); +INCBIN(tmpl_page_missing, "./tmpls/page-missing.t"); diff --git a/baked.h b/baked.h index d43ad54..aaa833c 100644 --- a/baked.h +++ b/baked.h @@ -7,4 +7,7 @@ INCBIN_EXTERN(gpp1); +INCBIN_EXTERN(tmpl_home); +INCBIN_EXTERN(tmpl_page_missing); + #endif // BAKED_H_ diff --git a/build.c b/build.c index 8aac01f..79366f0 100644 --- a/build.c +++ b/build.c @@ -18,6 +18,7 @@ int main(int argc, char ** argv) "./routes.c", "./baked.c", "./gpp.c", + "./tmpls.c", "./mongoose.o", "./gpp1" ) { @@ -36,10 +37,10 @@ int main(int argc, char ** argv) #if DEBUG CMD("cc", "-ggdb", "-I.", "-D_GNU_SOURCE", "-DGEBS_NO_PREFIX", "-o", "./aboba", - "./main.c", "./routes.c", "./baked.c", "./gpp.c", "./mongoose.o"); + "./main.c", "./routes.c", "./baked.c", "./gpp.c", "./tmpls.c", "./mongoose.o"); #else CMD("cc", "-I.", "-D_GNU_SOURCE", "-DGEBS_NO_PREFIX", "-o", "./aboba", - "./main.c", "./routes.c", "./baked.c", "./gpp.c", "./mongoose.o"); + "./main.c", "./routes.c", "./baked.c", "./gpp.c", "./tmpls.c", "./mongoose.o"); #endif } } else if (strcmp(cmd, "clean") == 0) { diff --git a/main.c b/main.c index be3bfa5..cd7f843 100644 --- a/main.c +++ b/main.c @@ -10,6 +10,7 @@ #include "routes.h" #include "gpp.h" +#include "tmpls.h" typedef void (*Route_Handler)(struct mg_connection *conn, struct mg_http_message *msg); @@ -44,6 +45,7 @@ static void init_route_hashtable(void) int main(int argc, char ** argv) { gpp_init(); + tmpls_init(); mg_log_set(MG_LL_DEBUG); struct mg_mgr mgr; @@ -60,6 +62,7 @@ int main(int argc, char ** argv) mg_mgr_free(&mgr); shfree(route_hashtable); + tmpls_deinit(); gpp_deinit(); return 0; diff --git a/routes.c b/routes.c index a7c2842..2950e7a 100644 --- a/routes.c +++ b/routes.c @@ -3,6 +3,7 @@ #include "routes.h" #include "gpp.h" +#include "tmpls.h" void route_page_not_found(struct mg_connection *conn, struct mg_http_message *msg) { @@ -13,7 +14,11 @@ void route_page_not_found(struct mg_connection *conn, struct mg_http_message *ms String_Builder out = {0}; defer { sb_free(&out); } - bool ok = gpp_run("./tmpls/page-missing.t", &env, &out); + + char path[PATH_MAX] = {0}; + tmpl_get_path_by_key(TMPL_PAGE_MISSING, path, sizeof(path)); + + bool ok = gpp_run(path, &env, &out); sb_finish(&out); if (!ok) { @@ -42,7 +47,11 @@ void route_home(struct mg_connection *conn, struct mg_http_message *msg) String_Builder out = {0}; defer { sb_free(&out); } - bool ok = gpp_run("./tmpls/index.t", &env, &out); + + char path[PATH_MAX] = {0}; + tmpl_get_path_by_key(TMPL_HOME, path, sizeof(path)); + + bool ok = gpp_run(path, &env, &out); sb_finish(&out); if (!ok) { diff --git a/tmpls.c b/tmpls.c new file mode 100644 index 0000000..260a716 --- /dev/null +++ b/tmpls.c @@ -0,0 +1,43 @@ +#include +#include + +#include "gebs/gebs.h" +#include "stb/stb_ds.h" + +#include "tmpls.h" +#include "baked.h" + +Template *tmpls = NULL; + +void create_tmpl(char *name, const unsigned char *data, size_t size) +{ + int fd = memfd_create(name, 0); + if (fd < 0) { + LOGE("Could not create file for template %s. Aborting...\n", name); + abort(); + } + write(fd, data, size); + + shput(tmpls, name, fd); +} + +void tmpls_init(void) +{ + create_tmpl(TMPL_HOME, tmpl_home_data, tmpl_home_size); + create_tmpl(TMPL_PAGE_MISSING, tmpl_page_missing_data, tmpl_page_missing_size); +} + +void tmpls_deinit(void) +{ + shfree(tmpls); +} + +void tmpl_get_path_by_key(char *key, char *buf, size_t size) +{ + // Check first since we can't have a default value here + if (shgeti(tmpls, key) != -1) { + int fd = shget(tmpls, key); + snprintf(buf, size, "/proc/%d/fd/%d", getpid(), fd); + } +} + diff --git a/tmpls.h b/tmpls.h new file mode 100644 index 0000000..069f6eb --- /dev/null +++ b/tmpls.h @@ -0,0 +1,18 @@ +#ifndef TMPLS_H_ +#define TMPLS_H_ + +#define TMPL_HOME "home.t" +#define TMPL_PAGE_MISSING "page-missing.t" + +typedef struct { + char *key; + int value; +} Template; + +extern Template *tmpls; + +void tmpls_init(void); +void tmpls_deinit(void); +void tmpl_get_path_by_key(char *key, char *buf, size_t size); + +#endif // TMPLS_H_ diff --git a/tmpls/index.t b/tmpls/home.t similarity index 100% rename from tmpls/index.t rename to tmpls/home.t