projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new message bits to web
[blerg.git]
/
database
/
tags.c
diff --git
a/database/tags.c
b/database/tags.c
index
dc51c4f
..
dc6bac8
100644
(file)
--- 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>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
@@
-8,28
+11,27
@@
#include <sys/file.h>
#include <sys/mman.h>
#include "tags.h"
#include <sys/file.h>
#include <sys/mman.h>
#include "tags.h"
+#include "util.h"
+#include "database.h"
#include "config.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) {
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:
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;
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;
i++;
}
if (start - i == 0) continue;
@@
-39,14
+41,17
@@
tag_scan_start:
if (!strncmp(tag, taglist[j], MAX_TAG_LENGTH)) {
// We already have this tag. Start over.
free(tag);
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++;
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;
}
// We goto here so i doesn't get incremented
goto tag_scan_start;
}
+ last_char = data[i];
}
for (i = 0; i < n_tags; i++) {
}
for (i = 0; i < n_tags; i++) {
@@
-57,7
+62,7
@@
tag_scan_start:
int tag_add(const char *author, const char *tag, uint64_t record) {
char filename[512];
int tag_add(const char *author, const char *tag, uint64_t record) {
char filename[512];
- struct
tag
t;
+ struct
blergref
t;
memset(t.author, 0, 32);
strncpy(t.author, author, 32);
memset(t.author, 0, 32);
strncpy(t.author, author, 32);
@@
-81,8
+86,8
@@
int tag_add(const char *author, const char *tag, uint64_t record) {
perror("Could not open tag file");
return 0;
}
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;
}
perror("Could not write new tag");
return 0;
}
@@
-92,12
+97,15
@@
int tag_add(const char *author, const char *tag, uint64_t record) {
return 1;
}
return 1;
}
-struct
tag
* tag_list(const char *tag, uint64_t offset, int *count, int direction) {
+struct
blergref
* tag_list(const char *tag, uint64_t offset, int *count, int direction) {
char filename[512];
struct stat st;
char filename[512];
struct stat st;
- struct
tag
*taglist;
- struct
tag
*retlist;
+ struct
blergref
*taglist;
+ struct
blergref
*retlist;
uint64_t n_tag_records;
uint64_t n_tag_records;
+
+ if (!valid_tag_name(tag + 1))
+ return NULL;
switch(tag[0]) {
case '#':
switch(tag[0]) {
case '#':
@@
-108,46
+116,43
@@
struct tag * tag_list(const char *tag, uint64_t offset, int *count, int directio
break;
default:
fprintf(stderr, "Invalid tag type: %s\n", tag);
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");
}
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) {
}
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");
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;
}
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:
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:
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;
}
break;
}
@@
-160,20
+165,16
@@
tag_list_malloc_failed:
tag_list_map_failed:
close(tag_fd);
tag_list_open_failed:
tag_list_map_failed:
close(tag_fd);
tag_list_open_failed:
+ *count = 0;
return NULL;
}
int tag_exists(const char *tag) {
return NULL;
}
int tag_exists(const char *tag) {
- int taglen = strlen(tag);
char filename[512];
char filename[512];
- if (taglen < 2) {
- fprintf(stderr, "Tag too short\n");
+ if (!valid_tag_name(tag + 1))
return 0;
return 0;
- } else if (taglen > 33) {
- fprintf(stderr, "Tag too long\n");
- return 0;
- }
+
if (!(tag[0] == '@' || tag[0] == '#')) {
fprintf(stderr, "Invalid tag: %s\n", tag);
return 0;
if (!(tag[0] == '@' || tag[0] == '#')) {
fprintf(stderr, "Invalid tag: %s\n", tag);
return 0;