Clean up some error handling in tag listing

[blerg.git] / database / tags.c

diff --git a/database/tags.c b/database/tags.c
index a28df02..5b3b3ce 100644 (file)
--- a/database/tags.c
+++ b/database/tags.c
@@ -12,10 +12,9 @@
 #include <sys/mman.h>
 #include "tags.h"
 #include "util.h"
+#include "database.h"
 #include "config.h"
 
-#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_PER_RECORD];
@@ -32,7 +31,7 @@ tag_scan_start:
                        }
                        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;
@@ -105,7 +104,7 @@ struct tag * tag_list(const char *tag, uint64_t offset, int *count, int directio
        struct tag *retlist;
        uint64_t n_tag_records;
 
-       if (!valid_name(tag + 1))
+       if (!valid_tag_name(tag + 1))
                return NULL;
        
        switch(tag[0]) {
@@ -129,26 +128,28 @@ struct tag * tag_list(const char *tag, uint64_t offset, int *count, int directio
 
        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;
+       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;
+               *count = 0;
+               goto tag_list_map_failed;
        }
 
        taglist = (struct tag *) mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, tag_fd, 0);
        if (taglist == MAP_FAILED) {
                perror("Could not mmap tag file");
+               *count = 0;
                goto tag_list_map_failed;
        }
        retlist = (struct tag *) malloc(sizeof(struct tag) * *count);
        if (retlist == NULL) {
                perror("Could not allocate memory for tag list");
+               *count = 0;
                goto tag_list_malloc_failed;
        }
        switch(direction) {
@@ -175,7 +176,7 @@ tag_list_open_failed:
 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] == '#')) {