1 files changed, 35 insertions, 5 deletions

diff --git a/src/str.c b/src/str.c
index ef2edad..d896868 100644
--- a/src/str.c
+++ b/src/str.c
@@ -1,24 +1,54 @@
 #include "db.h"
 
 
-uint16_t len(const char *s){
-	uint16_t l = -1;
+uint32_t len(const char *s){
+	uint32_t l = -1;
 	while(s[++l]);
 	return l;
 }
 
 bool sameStr(const char *s1, const char *s2){
-	uint16_t i1 = 0, i2 = 0;
+	uint32_t i1 = 0, i2 = 0;
 	while(s1[i1] && s1[i1] == s2[i2])
 		++i1, ++i2;
 	return !s1[i1] && !s2[i2];
 }
 
+// Lowercases the whole string and removes trailing spaces
+char *normalizeStr(const char *str, uint32_t *l){
+	*l = len(str);
+	uint32_t trw = 0;
+	while(isspace(str[--(*l)]))
+		++trw;
+	char *nstr = calloc(++(*l)+1, sizeof(char));
+	for(int i = 0; i < *l; ++i)
+		nstr[i] = tolower(str[i]);
+	return nstr;
+}
+
+// Same as normalizeStr but with a limit (str[limit] will be equal to '\0')
+// If limit is 0, it will return NULL
+// WARNING: It allocates limit+1 characters
+char *normalizeStrLimit(const char *str, uint32_t *l, uint32_t limit){
+	if(limit == 0){
+		return NULL;
+	}
+	*l = len(str);
+	*l = (*l > limit) ? limit : *l;
+	uint32_t trw = 0;
+	while(isspace(str[--(*l)]))
+		++trw;
+	char *nstr = calloc(++(*l)+1, sizeof(char));
+	for(int i = 0; i < *l; ++i)
+		nstr[i] = tolower(str[i]);
+	return nstr;
+}
+
 // Auxiliary function for creating a lookup table of the haystack
 // table[i] will be the number of shifts right until the next
 // separator when checking position i
 // Only really useful for this implementation of tags
-static int *table(const char *y, int n, char sep){
+static int *toTable(const char *y, int n, char sep){
 	int *tb = calloc(n, sizeof(int));
 	if(tb == NULL){
 		fprintf(stderr, "Error callocating array (table)");
@@ -41,7 +71,7 @@ static int *table(const char *y, int n, char sep){
 // A return of 0 means ndl occurs in tags starting in position 0
 // Use 'if(strInTags(...) != -1)' when using this function
 ssize_t strInTags(const char *tags, int n, const char *ndl, int m, char sep){
-	int *tb = table(tags, n, sep);
+	int *tb = toTable(tags, n, sep);
 
 	for(int i = 0; i < n; ){
 		int j = 0;