Add some missing includes

[blerg.git] / database / util.c

diff --git a/database/util.c b/database/util.c
index 2accd5d..b0ecd17 100644 (file)
--- a/database/util.c
+++ b/database/util.c
@@ -2,18 +2,27 @@
  * BSD-style license.  Please see the COPYING file for details.
  */
 
-#define VALID_CHAR(x) (x == ' ' || x == '\'' || x == '-' || x == '.' || (x >= '0' && x <= '9') || (x >= 'A' && x <= 'Z') || x == '_' || (x >= 'a' && x <= 'z'))
+#include "database.h"
+#include "config.h"
 
-int valid_name(const char *name) {
+int valid_name_len(const char *name, int maxlength) {
        int i;
 
-       for (i = 0; i < 32; i++) {
+       for (i = 0; i < maxlength; i++) {
                if (name[i] == 0) break;
                if (!VALID_CHAR(name[i])) return 0;
        }
 
-       if (i >= 32)
+       if (i >= maxlength)
                return 0;
 
        return 1;
 }
+
+int valid_tag_name(const char *name) {
+       return valid_name_len(name, MAX_TAG_LENGTH);
+}
+
+int valid_name(const char *name) {
+       return valid_name_len(name, 32);
+}