(#6) Re-implement header and functions better

examples/header.shmd

@@ -6,7 +6,7 @@
  * sh_node() 'echo "console.log($1)" | node'
  */
 
-# $(echo $title)
+# $(echo "$title")
 
 ## Body Here
 

shmd.c

@@ -75,8 +75,51 @@ char **header_process_fields(FILE *fp, enum header_field_type type)
     return values;
 }
 
-/* Process a header record */
-char *header_process(FILE *fp)
+char *header_to_html(enum header_field_type type, char *name, char **values)
+{
+    char *result;
+    switch (type) {
+    case E_HEADER_FIELD_CHARSET:
+        result = str_concat(3, "<meta charset=\"", values[0], "\">");
+        break;
+    case E_HEADER_FIELD_TITLE:
+        result = str_concat(3, "<title>", values[0], "</title>");
+        break;
+    case E_HEADER_FIELD_LINK:
+        result = str_concat(
+            5, "<link rel=\"", values[0], "\" href=\"", values[1], "\">"
+        );
+        break;
+    case E_HEADER_FIELD_META:
+        result = str_concat(
+            5, "<meta name=\"", name, "\" content=\"", values[0], "\">"
+        );
+        break;
+    }
+    return result;
+}
+
+char *header_to_sh(enum header_field_type type, char *name, char **values)
+{
+    char *result;
+    size_t name_size = strlen(name);
+    // name=(last value)
+    char *value = values[header_field_count(type) - 1];
+    bool is_function = (
+        type == E_HEADER_FIELD_META
+        && name[name_size-2] == '('
+        && name[name_size-1] == ')'
+    );
+
+    if (is_function) {
+        result = str_concat(4, name, " { ", value, "; }; ");
+    } else {
+        result = str_concat(4, name, "='", value, "'; ");
+    }
+    return result;
+}
+
+void header_process(FILE *fp)
 {
     size_t name_size = 100;
     char* name = STR_EALLOC(name_size);
@@ -98,7 +141,11 @@ char *header_process(FILE *fp)
     char **values = header_process_fields(fp, type);
     size_t values_count = header_field_count(type);
 
-    return name;
+    char *tmp = str_concat(2, sh_prefix, header_to_sh(type, name, values));
+    free(sh_prefix);
+    sh_prefix = tmp;
+
+    puts(header_to_html(type, name, values));
 }
 
 #define HEADER_ISEND(b, c) (b == '*' && c == '/')
@@ -222,6 +269,6 @@ int process_input(FILE* fp) {
 
 int main(int argc, char* argv[]) {
     SET_ARGV0();
-    sh_prefix = STR_EALLOC(100);
+    sh_prefix = STR_EALLOC(1);
     return process_input(stdin);
 }

shmd.h

@@ -1,7 +1,5 @@
 #include "util.h"
 
-
-
 /**
  * #argv0
  * value of argv[0] at the start of execution (ie. the program's name).
@@ -22,7 +20,16 @@ char *header_process_extract_field(FILE *fp);
 size_t header_field_count(enum header_field_type type);
 /* Read space-seperated fields from @fp */
 char **header_process_fields(FILE *fp, enum header_field_type type);
-char *header_process(FILE *fp);
+/* Get the html-ized version of a header */
+char *header_to_html(enum header_field_type type, char *name, char **values);
+/*
+ * Get the shell-executable assignment of a header, using the last value as
+ * the value.
+ * In the special case @type is E_HEADER_FIELD_META and @name ends in '()',
+ * will return a posix-style function declaration.
+ */
+char *header_to_sh(enum header_field_type type, char *name, char **values);
+void header_process(FILE *fp);
 char *header_substitute(FILE *fp);