#include <sys/mman.h>
#include "tags.h"
#include "util.h"
+#include "database.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 == '_')
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;
}
int begin = i;
int start = ++i;
- while (i < len && TAG_CHAR(data[i]) && (i - start < MAX_TAG_LENGTH)) {
+ while (i < len && VALID_CHAR(data[i]) && (i - start < MAX_TAG_LENGTH)) {
i++;
}
if (start - i == 0) continue;
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++) {
struct tag *retlist;
uint64_t n_tag_records;
- if (!valid_name(tag + 1))
+ if (!valid_tag_name(tag + 1))
return NULL;
switch(tag[0]) {
int tag_exists(const char *tag) {
char filename[512];
- if (!valid_name(tag + 1))
+ if (!valid_tag_name(tag + 1))
return 0;
if (!(tag[0] == '@' || tag[0] == '#')) {