Merge "Add wait for start jobs"

[src/app-framework-main.git] / src / wgtpkg-mustach.c

diff --git a/src/wgtpkg-mustach.c b/src/wgtpkg-mustach.c
index 110f11b..5e4348a 100644 (file)
--- a/src/wgtpkg-mustach.c
+++ b/src/wgtpkg-mustach.c
@@ -21,15 +21,17 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 
 #include <json-c/json.h>
 
 #include "mustach.h"
+#include "verbose.h"
 
 #define MAX_DEPTH 256
 
 /*
- * exploration state when instanciating mustache
+ * exploration state when instantiating mustache
  */
 struct expl {
        struct json_object *root;
@@ -60,8 +62,8 @@ static char *keyval(char *read, int isptr)
                } else {
                        if (c == '\\') {
                                switch (read[1]) {
-                               case '\\': *write++ = c;
-                               case '=': c = *++read;
+                               case '\\': *write++ = c; /*@fallthrough@*/
+                               case '=': c = *++read; /*@fallthrough@*/
                                default: break;
                                }
                        }
@@ -90,8 +92,8 @@ static char *first(char **name, int isptr)
                        while (c && c != '/') {
                                if (c == '~') {
                                        switch(read[1]) {
-                                       case '1': c = '/';
-                                       case '0': read++;
+                                       case '1': c = '/'; /*@fallthrough@*/
+                                       case '0': read++; /*@fallthrough@*/
                                        default: break;
                                        }
                                }
@@ -321,8 +323,29 @@ static struct mustach_itf itf = {
  */
 int apply_mustach(const char *template, struct json_object *root, char **result, size_t *size)
 {
+       int rc;
        struct expl e;
+
        e.root = root;
-       return mustach(template, &itf, &e, result, size);
+       rc = mustach(template, &itf, &e, result, size);
+       if (rc < 0) {
+               static const char *msgs[] = {
+                       "SYSTEM",
+                       "UNEXPECTED_END",
+                       "EMPTY_TAG",
+                       "TAG_TOO_LONG",
+                       "BAD_SEPARATORS",
+                       "TOO_DEPTH",
+                       "CLOSING",
+                       "BAD_UNESCAPE_TAG"
+               };
+
+               rc = -(rc + 1);
+               ERROR("mustach error found: MUSTACH_ERROR_%s",
+                       rc < 0 || rc >= (int)(sizeof msgs / sizeof * msgs) ? "???" : msgs[rc]);
+               rc = -1;
+               errno = EINVAL;
+       }
+       return rc;
 }