Merge pull request #100 from mariux64/honor-server-prerequisites

Honor server prerequisites
mariux64 · Apr 15, 2021 · c593fb5 · c593fb5
2 parents 5bff524 + 50e80e6
commit c593fb5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 MXQ_VERSION_MAJOR = 0
 MXQ_VERSION_MINOR = 27
-MXQ_VERSION_PATCH = 1
+MXQ_VERSION_PATCH = 2
 MXQ_VERSION_EXTRA = "beta"
 MXQ_VERSIONDATE = 2021
 

diff --git a/mxqd_control.c b/mxqd_control.c
@@ -34,6 +34,22 @@ static int server_is_qualified(struct mxq_server *server, struct mxq_group *grou
         if (parser_context.result == 0)
             return 0;   // evaluated to false
     }
+    if (*server->daemon.prerequisites != 0) {
+        if (*group->tags == 0) {
+            return 0;
+        }
+        _mx_cleanup_(keywordset_free_byref) struct keywordset *kws =  keywordset_new(group->tags);
+        struct parser_context parser_context = {
+            .input = server->daemon.prerequisites,
+            .tags = kws,
+            .pos = 0,
+            .result = 0,
+        };
+        if (yyparse(&parser_context))
+            return 0;    // syntax error in expression
+        if (parser_context.result == 0)
+            return 0;    // evaluated to false
+    }
     return (1);
 }