all repos — eureka @ e1d19dc2a041a393db8cce4f9d902dea2397b175

static site generator based on the 100r.co engine 

compact some code, reorder function definitions
Iris Lightshard nilix@nilfm.cc
PGP Signature 
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmIK/H4ACgkQO3+8IhRO
Y5iqEBAAknuwrg9R5sp/D8+39lQIwuhUjdagiA7Sin7byrqvF0VUiHzD4nV0SpQb
ztDZ2SQDiEH3COcEe5NmvFY3ljLO9HRfkqq2XwMrcXv8v6wA0gpjYXxEd5+tbYx2
IdihetodUbtZPiqDgeWCX3TCnlmoSGj7C4pKqHWGC+7mvd4tq84RxKAmjsIrumnA
TUunzx08aDxbAhG8wh+LonrbvWz1hlYRm6e5w9b9mhGMXGsL0Vwkbo2WfVXueNXK
z5CMUqKew5aAZrQgGyB+UTeB2cxR7ERWFyYmiE54mfFA9DPmGKF8/ZwgqcYN3p+L
Da2OKwTRMRBSZgmGc8jSctJq9WWW4s1SeT9PN17auU/NSbRFC33h4h8223g6pmrs
3k4Q80ucQraYm44EalHSoTgPljgIRncnWRYztHHx4UlYi8tbJDQNrjZxB7QjsQHT
bdqwaKbGxEP1rFd93Xrv4eGv6DT9ZsPTnvOsN6PGp84OU93s5izbuRIoLjhevlEr
7OCoCzPqmHP3oov165N4dRJPtBlcPzgKCG9HUPiY1ny8kXfYmC/Jl3izsEFAKLMz
C17pYv+NhVjPPCRAi3qyfQeDn7LQCGNEkSJ6jufZkjapQpXGKHfeWMBtZeBrYPmo
rIWKBKEPwbNV+aAQQ+oTxlXn4IBBNv+2xXvmHPSSQItIHVxJXko=
=T7rm
-----END PGP SIGNATURE-----
commit

e1d19dc2a041a393db8cce4f9d902dea2397b175

parent

439619fd297237592815b8f6dbc0e6564fd88af0

1 files changed, 41 insertions(+), 48 deletions(-)

jump to
M main.c → main.c 
@@ -361,49 +361,6 @@ fputs("</blockquote>", f);
   return 1;
 }
 
-int fpmetatemplate(FILE* f, Lexicon* l, char* s) {
-  int bopen, bclose;
-  char ss[TAG_BODY_SIZE];
-  unsigned char t = 0;
-  bopen = 0;
-  bclose = 0;
-
-  while (*s) {
-    if (*s == '}') {
-      bclose++;
-      if (bopen == bclose) {
-        t = 0;
-        bopen = 0;
-        bclose = 0;
-      }
-      if (bopen == bclose) {
-        s++;
-        if (!fptemplate(f, l, ss)) {
-          return 0;
-        }
-        continue;
-      }
-    }
-    if (*s == '{') {
-      bopen++;
-      if (bopen == 1) {
-        ss[0] = 0;
-        t = 1;
-        s++;
-        continue;
-      }
-    }
-    if (slen(s) >= TAG_BODY_SIZE)
-      return error("Templating error", "text block exceeds tag body size");
-    if (t) {
-      ccat(ss, *s);
-    } else
-      fprintf(f, "%c", *s);
-    s++;
-  }
-  return 1;
-}
-
 int fptemplate(FILE* f, Lexicon* l, char* s) {
   int target = 0;
   switch (s[0]) {

@@ -456,6 +413,47 @@ l->refs[target]++;
   return 1;
 }
 
+int fpmetatemplate(FILE* f, Lexicon* l, char* s) {
+  int bopen, bclose;
+  char ss[TAG_BODY_SIZE];
+  unsigned char t = 0;
+  bopen = 0;
+  bclose = 0;
+
+  while (*s) {
+    if (*s == '}') {
+      bclose++;
+      if (bopen == bclose) {
+        t = 0;
+        bopen = 0;
+        bclose = 0;
+        s++;
+        if (!fptemplate(f, l, ss)) {
+          return 0;
+        }
+        continue;
+      }
+    }
+    if (*s == '{') {
+      bopen++;
+      if (bopen == 1) {
+        ss[0] = 0;
+        t = 1;
+        s++;
+        continue;
+      }
+    }
+    if (slen(s) >= TAG_BODY_SIZE)
+      return error("Templating error", "text block exceeds tag body size");
+    if (t) {
+      ccat(ss, *s);
+    } else
+      fprintf(f, "%c", *s);
+    s++;
+  }
+  return 1;
+}
+
 int fpinject(FILE* f, Lexicon* l, char* filepath) {
   FILE* inc;
   int bopen, bclose;

@@ -475,9 +473,6 @@ if (bopen == bclose) {
         t = 0;
         bopen = 0;
         bclose = 0;
-      }
-
-      if (bopen == bclose) {
         if (!fptemplate(f, l, s)) {
           return 0;
         }

@@ -487,10 +482,8 @@ }
     if (c == '{') {
       bopen++;
       if (bopen == 1) {
-
         s[0] = 0;
         t = 1;
-
         continue;
       }
     }