X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=database%2Ftags.c;h=a28df02b4faae2ac736d6fe02dd4678dce688fad;hb=962952a442b74a5d5fe365f77ab5481bc3cd3eba;hp=356ef8860f9f8fa7f84750a9cfecb23b4964c745;hpb=96ec261b36bdbb701e05f5ee1aab70dec44085f9;p=blerg.git

diff --git a/database/tags.c b/database/tags.c
index 356ef88..a28df02 100644
--- a/database/tags.c
+++ b/database/tags.c
@@ -1,3 +1,6 @@
+/* Blerg is (C) 2011 The Dominion of Awesome, and is distributed under a
+ * BSD-style license.  Please see the COPYING file for details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -11,20 +14,19 @@
 #include "util.h"
 #include "config.h"
 
-#define MAX_TAG_LENGTH 64
-#define MAX_TAGS 1024
-
 #define TAG_CHAR(c) ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '_')
+#define WHITESPACE(c) (c == ' ' || c == '\t' || c == '\n' || c == '\r')
 
 int tag_scan(const char *author, const char *data, int len, uint64_t record) {
-	char *taglist[MAX_TAGS];
+	char *taglist[MAX_TAGS_PER_RECORD];
+	char last_char = ' ';
 	int n_tags = 0;
 	int i, j;
 
 	for (i = 0; i < len; i++) {
 tag_scan_start:
-		if (data[i] == '#' || data[i] == '@') {
-			if (n_tags == MAX_TAGS) {
+		if (WHITESPACE(last_char) && (data[i] == '#' || data[i] == '@')) {
+			if (n_tags == MAX_TAGS_PER_RECORD) {
 				fprintf(stderr, "Too many tags in message\n");
 				break;
 			}
@@ -40,14 +42,17 @@ tag_scan_start:
 				if (!strncmp(tag, taglist[j], MAX_TAG_LENGTH)) {
 					// We already have this tag.  Start over.
 					free(tag);
+					last_char = data[i-1];
 					goto tag_scan_start;
 				}
 			}
 			taglist[n_tags] = tag;
 			n_tags++;
+			last_char = data[i-1];
 			// We goto here so i doesn't get incremented
 			goto tag_scan_start;
 		}
+		last_char = data[i];
 	}
 
 	for (i = 0; i < n_tags; i++) {