X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=database%2Ftags.c;h=3e3b14fa864f592ba05e38d962ad9ef34d7ca25b;hb=c38b2e192d8de8ef38389cc8071881464fff99bb;hp=1911ac8d9e6f812f4ed50ce8ca513c7a3e46b486;hpb=1cf0f1ebfbd5b5a621af2a49ac0328fd0cec4bf4;p=blerg.git diff --git a/database/tags.c b/database/tags.c index 1911ac8..3e3b14f 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 #include #include @@ -8,28 +11,28 @@ #include #include #include "tags.h" +#include "util.h" +#include "database.h" #include "config.h" +#include "configuration.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; @@ -39,25 +42,29 @@ 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++) { tag_add(author, taglist[i], record); free(taglist[i]); } + return 1; } int tag_add(const char *author, const char *tag, uint64_t record) { - char filename[512]; - struct tag t; + char filename[FILENAME_MAX]; + struct blergref t; memset(t.author, 0, 32); strncpy(t.author, author, 32); @@ -65,10 +72,10 @@ int tag_add(const char *author, const char *tag, uint64_t record) { switch(tag[0]) { case '#': - snprintf(filename, 512, "%s/%s", HASH_TAGS_PATH, tag + 1); + snprintf(filename, FILENAME_MAX, "%s/%s", blergconf.hash_tags_path, tag + 1); break; case '@': - snprintf(filename, 512, "%s/%s", REF_TAGS_PATH, tag + 1); + snprintf(filename, FILENAME_MAX, "%s/%s", blergconf.ref_tags_path, tag + 1); break; default: fprintf(stderr, "Invalid tag type: %s\n", tag); @@ -81,8 +88,8 @@ int tag_add(const char *author, const char *tag, uint64_t record) { perror("Could not open tag file"); return 0; } - int n = write(tag_fd, &t, sizeof(struct tag)); - if (n < sizeof(struct tag)) { + int n = write(tag_fd, &t, sizeof(struct blergref)); + if (n < sizeof(struct blergref)) { perror("Could not write new tag"); return 0; } @@ -92,62 +99,67 @@ int tag_add(const char *author, const char *tag, uint64_t record) { return 1; } -struct tag * tag_list(const char *tag, uint64_t offset, uint64_t *count, int direction) { - char filename[512]; +struct blergref * tag_list(const char *tag, uint64_t offset, int *count, int direction) { + char filename[FILENAME_MAX]; struct stat st; - struct tag *taglist; - struct tag *retlist; + struct blergref *taglist; + struct blergref *retlist; uint64_t n_tag_records; + + if (!valid_tag_name(tag + 1)) + return NULL; + + if (!(direction == 1 || direction == -1)) { + fprintf(stderr, "Invalid direction: %d\n", direction); + return NULL; + } switch(tag[0]) { case '#': - snprintf(filename, 512, "%s/%s", HASH_TAGS_PATH, tag + 1); + snprintf(filename, FILENAME_MAX, "%s/%s", blergconf.hash_tags_path, tag + 1); break; case '@': - snprintf(filename, 512, "%s/%s", REF_TAGS_PATH, tag + 1); + snprintf(filename, FILENAME_MAX, "%s/%s", blergconf.ref_tags_path, tag + 1); break; default: fprintf(stderr, "Invalid tag type: %s\n", tag); - return 0; + return NULL; } int tag_fd = open(filename, O_RDONLY, 0600); if (tag_fd == -1) { perror("Could not open tag file"); - *count = 0; - return NULL; + goto tag_list_open_failed; } fstat(tag_fd, &st); if (st.st_size == 0) { - close(tag_fd); - *count = 0; - return NULL; + goto tag_list_map_failed; } - n_tag_records = st.st_size / sizeof(struct tag); - if (*count > n_tag_records) - *count = n_tag_records; + n_tag_records = st.st_size / sizeof(struct blergref); + if (*count > n_tag_records - offset) + *count = n_tag_records - offset; if (offset > n_tag_records) { fprintf(stderr, "Cannot access tag record beyond end\n"); - return NULL; + goto tag_list_map_failed; } - taglist = (struct tag *) mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, tag_fd, 0); + taglist = (struct blergref *) mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, tag_fd, 0); if (taglist == MAP_FAILED) { perror("Could not mmap tag file"); goto tag_list_map_failed; } - retlist = (struct tag *) malloc(sizeof(struct tag) * *count); + retlist = (struct blergref *) malloc(sizeof(struct blergref) * *count); if (retlist == NULL) { perror("Could not allocate memory for tag list"); goto tag_list_malloc_failed; } switch(direction) { case 1: - memcpy(retlist, taglist + offset, sizeof(struct tag) * *count); + memcpy(retlist, taglist + offset, sizeof(struct blergref) * *count); break; case -1: - memcpy(retlist, taglist + (n_tag_records - *count - offset), sizeof(struct tag) * *count); + memcpy(retlist, taglist + (n_tag_records - *count - offset), sizeof(struct blergref) * *count); break; } @@ -160,20 +172,16 @@ tag_list_malloc_failed: tag_list_map_failed: close(tag_fd); tag_list_open_failed: + *count = 0; return NULL; } int tag_exists(const char *tag) { - int taglen = strlen(tag); - char filename[512]; + char filename[FILENAME_MAX]; - if (taglen < 2) { - fprintf(stderr, "Tag too short\n"); - return 0; - } else if (taglen > 33) { - fprintf(stderr, "Tag too long\n"); + if (!valid_tag_name(tag + 1)) return 0; - } + if (!(tag[0] == '@' || tag[0] == '#')) { fprintf(stderr, "Invalid tag: %s\n", tag); return 0; @@ -181,10 +189,10 @@ int tag_exists(const char *tag) { switch(tag[0]) { case '#': - snprintf(filename, 512, "%s/%s", HASH_TAGS_PATH, tag + 1); + snprintf(filename, FILENAME_MAX, "%s/%s", blergconf.hash_tags_path, tag + 1); break; case '@': - snprintf(filename, 512, "%s/%s", REF_TAGS_PATH, tag + 1); + snprintf(filename, FILENAME_MAX, "%s/%s", blergconf.ref_tags_path, tag + 1); break; default: fprintf(stderr, "Invalid tag type: %s\n", tag);