1 files changed, 115 insertions, 115 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 2026738..cf25d5b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -12,20 +12,20 @@ static const char hex_chars[] = "0123456789abcdef";
 
 
 /**
- * init the buffer 
- * 
+ * init the buffer
+ *
  */
 
 buffer* buffer_init(void) {
 	buffer *b;
-	
+
 	b = malloc(sizeof(*b));
 	assert(b);
-	
+
 	b->ptr = NULL;
 	b->size = 0;
 	b->used = 0;
-	
+
 	return b;
 }
 
@@ -36,8 +36,8 @@ buffer *buffer_init_buffer(buffer *src) {
 }
 
 /**
- * free the buffer 
- * 
+ * free the buffer
+ *
  */
 
 void buffer_free(buffer *b) {
@@ -49,39 +49,39 @@ void buffer_free(buffer *b) {
 
 void buffer_reset(buffer *b) {
 	if (!b) return;
-	
+
 	/* limit don't reuse buffer larger than ... bytes */
 	if (b->size > BUFFER_MAX_REUSE_SIZE) {
 		free(b->ptr);
 		b->ptr = NULL;
 		b->size = 0;
 	}
-	
+
 	b->used = 0;
 }
 
 
 /**
- * 
- * allocate (if neccessary) enough space for 'size' bytes and 
+ *
+ * allocate (if neccessary) enough space for 'size' bytes and
  * set the 'used' counter to 0
- * 
+ *
  */
 
 #define BUFFER_PIECE_SIZE 64
 
 int buffer_prepare_copy(buffer *b, size_t size) {
 	if (!b) return -1;
-	
-	if ((0 == b->size) || 
+
+	if ((0 == b->size) ||
 	    (size > b->size)) {
 		if (b->size) free(b->ptr);
-		
+
 		b->size = size;
-		
+
 		/* always allocate a multiply of BUFFER_PIECE_SIZE */
 		b->size += BUFFER_PIECE_SIZE - (b->size % BUFFER_PIECE_SIZE);
-		
+
 		b->ptr = malloc(b->size);
 		assert(b->ptr);
 	}
@@ -90,30 +90,30 @@ int buffer_prepare_copy(buffer *b, size_t size) {
 }
 
 /**
- * 
+ *
  * increase the internal buffer (if neccessary) to append another 'size' byte
  * ->used isn't changed
- * 
+ *
  */
 
 int buffer_prepare_append(buffer *b, size_t size) {
 	if (!b) return -1;
-	
+
 	if (0 == b->size) {
 		b->size = size;
-		
+
 		/* always allocate a multiply of BUFFER_PIECE_SIZE */
 		b->size += BUFFER_PIECE_SIZE - (b->size % BUFFER_PIECE_SIZE);
-		
+
 		b->ptr = malloc(b->size);
 		b->used = 0;
 		assert(b->ptr);
 	} else if (b->used + size > b->size) {
 		b->size += size;
-		
+
 		/* always allocate a multiply of BUFFER_PIECE_SIZE */
 		b->size += BUFFER_PIECE_SIZE - (b->size % BUFFER_PIECE_SIZE);
-		
+
 		b->ptr = realloc(b->ptr, b->size);
 		assert(b->ptr);
 	}
@@ -122,7 +122,7 @@ int buffer_prepare_append(buffer *b, size_t size) {
 
 int buffer_copy_string(buffer *b, const char *s) {
 	size_t s_len;
-	
+
 	if (!s || !b) return -1;
 
 	s_len = strlen(s) + 1;
@@ -136,26 +136,26 @@ int buffer_copy_string(buffer *b, const char *s) {
 
 int buffer_copy_string_len(buffer *b, const char *s, size_t s_len) {
 	if (!s || !b) return -1;
-#if 0	
-	/* removed optimization as we have to keep the empty string 
+#if 0
+	/* removed optimization as we have to keep the empty string
 	 * in some cases for the config handling
-	 * 
+	 *
 	 * url.access-deny = ( "" )
 	 */
 	if (s_len == 0) return 0;
-#endif	
+#endif
 	buffer_prepare_copy(b, s_len + 1);
-	
+
 	memcpy(b->ptr, s, s_len);
 	b->ptr[s_len] = '\0';
 	b->used = s_len + 1;
-	
+
 	return 0;
 }
 
 int buffer_copy_string_buffer(buffer *b, const buffer *src) {
 	if (!src) return -1;
-	
+
 	if (src->used == 0) {
 		b->used = 0;
 		return 0;
@@ -201,10 +201,10 @@ int buffer_append_string_rfill(buffer *b, const char *s, size_t maxlen) {
 
 /**
  * append a string to the end of the buffer
- * 
- * the resulting buffer is terminated with a '\0' 
+ *
+ * the resulting buffer is terminated with a '\0'
  * s is treated as a un-terminated string (a \0 is handled a normal character)
- * 
+ *
  * @param b a buffer
  * @param s the string
  * @param s_len size of the string (without the terminating \0)
@@ -228,7 +228,7 @@ int buffer_append_string_len(buffer *b, const char *s, size_t s_len) {
 int buffer_append_string_buffer(buffer *b, const buffer *src) {
 	if (!src) return -1;
 	if (src->used == 0) return 0;
-	
+
 	return buffer_append_string_len(b, src->ptr, src->used - 1);
 }
 
@@ -245,9 +245,9 @@ int buffer_append_memory(buffer *b, const char *s, size_t s_len) {
 
 int buffer_copy_memory(buffer *b, const char *s, size_t s_len) {
 	if (!s || !b) return -1;
-	
+
 	b->used = 0;
-	
+
 	return buffer_append_memory(b, s, s_len);
 }
 
@@ -402,46 +402,46 @@ char hex2int(unsigned char hex) {
 
 
 /**
- * init the buffer 
- * 
+ * init the buffer
+ *
  */
 
 buffer_array* buffer_array_init(void) {
 	buffer_array *b;
-	
+
 	b = malloc(sizeof(*b));
-	
+
 	assert(b);
 	b->ptr = NULL;
 	b->size = 0;
 	b->used = 0;
-	
+
 	return b;
 }
 
 void buffer_array_reset(buffer_array *b) {
 	size_t i;
-	
+
 	if (!b) return;
-	
+
 	/* if they are too large, reduce them */
 	for (i = 0; i < b->used; i++) {
 		buffer_reset(b->ptr[i]);
 	}
-	
+
 	b->used = 0;
 }
 
 
 /**
- * free the buffer_array 
- * 
+ * free the buffer_array
+ *
  */
 
 void buffer_array_free(buffer_array *b) {
 	size_t i;
 	if (!b) return;
-	
+
 	for (i = 0; i < b->size; i++) {
 		if (b->ptr[i]) buffer_free(b->ptr[i]);
 	}
@@ -451,7 +451,7 @@ void buffer_array_free(buffer_array *b) {
 
 buffer *buffer_array_append_get_buffer(buffer_array *b) {
 	size_t i;
-	
+
 	if (b->size == 0) {
 		b->size = 16;
 		b->ptr = malloc(sizeof(*b->ptr) * b->size);
@@ -467,13 +467,13 @@ buffer *buffer_array_append_get_buffer(buffer_array *b) {
 			b->ptr[i] = NULL;
 		}
 	}
-	
+
 	if (b->ptr[b->used] == NULL) {
 		b->ptr[b->used] = buffer_init();
 	}
-	
+
 	b->ptr[b->used]->used = 0;
-	
+
 	return b->ptr[b->used++];
 }
 
@@ -482,23 +482,23 @@ char * buffer_search_string_len(buffer *b, const char *needle, size_t len) {
 	size_t i;
 	if (len == 0) return NULL;
 	if (needle == NULL) return NULL;
-	
+
 	if (b->used < len) return NULL;
-	
+
 	for(i = 0; i < b->used - len; i++) {
 		if (0 == memcmp(b->ptr + i, needle, len)) {
 			return b->ptr + i;
 		}
 	}
-	
+
 	return NULL;
 }
 
 buffer *buffer_init_string(const char *str) {
 	buffer *b = buffer_init();
-	
+
 	buffer_copy_string(b, str);
-	
+
 	return b;
 }
 
@@ -508,7 +508,7 @@ int buffer_is_empty(buffer *b) {
 
 /**
  * check if two buffer contain the same data
- * 
+ *
  * HISTORY: this function was pretty much optimized, but didn't handled
  * alignment properly.
  */
@@ -522,100 +522,100 @@ int buffer_is_equal(buffer *a, buffer *b) {
 
 int buffer_is_equal_string(buffer *a, const char *s, size_t b_len) {
 	buffer b;
-	
+
 	b.ptr = (char *)s;
 	b.used = b_len + 1;
-	
+
 	return buffer_is_equal(a, &b);
 }
 
 /* simple-assumption:
- * 
+ *
  * most parts are equal and doing a case conversion needs time
- * 
+ *
  */
 int buffer_caseless_compare(const char *a, size_t a_len, const char *b, size_t b_len) {
 	size_t ndx = 0, max_ndx;
 	size_t *al, *bl;
 	size_t mask = sizeof(*al) - 1;
-	
+
 	al = (size_t *)a;
 	bl = (size_t *)b;
-	
+
 	/* is the alignment correct ? */
 	if ( ((size_t)al & mask) == 0 &&
 	     ((size_t)bl & mask) == 0 ) {
-		
+
 		max_ndx = ((a_len < b_len) ? a_len : b_len) & ~mask;
-		
+
 		for (; ndx < max_ndx; ndx += sizeof(*al)) {
 			if (*al != *bl) break;
 			al++; bl++;
-			
+
 		}
-		
+
 	}
-	
+
 	a = (char *)al;
 	b = (char *)bl;
-	
+
 	max_ndx = ((a_len < b_len) ? a_len : b_len);
-	
+
 	for (; ndx < max_ndx; ndx++) {
 		char a1 = *a++, b1 = *b++;
-		
+
 		if (a1 != b1) {
 			if ((a1 >= 'A' && a1 <= 'Z') && (b1 >= 'a' && b1 <= 'z'))
 				a1 |= 32;
 			else if ((a1 >= 'a' && a1 <= 'z') && (b1 >= 'A' && b1 <= 'Z'))
 				b1 |= 32;
 			if ((a1 - b1) != 0) return (a1 - b1);
-			
+
 		}
 	}
-	
+
 	return 0;
 }
 
 
 /**
  * check if the rightmost bytes of the string are equal.
- * 
- * 
+ *
+ *
  */
 
 int buffer_is_equal_right_len(buffer *b1, buffer *b2, size_t len) {
 	/* no, len -> equal */
 	if (len == 0) return 1;
-	
+
 	/* len > 0, but empty buffers -> not equal */
 	if (b1->used == 0 || b2->used == 0) return 0;
-	
+
 	/* buffers too small -> not equal */
 	if (b1->used - 1 < len || b1->used - 1 < len) return 0;
-	
-	if (0 == strncmp(b1->ptr + b1->used - 1 - len, 
+
+	if (0 == strncmp(b1->ptr + b1->used - 1 - len,
 			 b2->ptr + b2->used - 1 - len, len)) {
 		return 1;
 	}
-	
+
 	return 0;
 }
 
 int buffer_copy_string_hex(buffer *b, const char *in, size_t in_len) {
 	size_t i;
-	
+
 	/* BO protection */
 	if (in_len * 2 < in_len) return -1;
-	
+
 	buffer_prepare_copy(b, in_len * 2 + 1);
-	
+
 	for (i = 0; i < in_len; i++) {
 		b->ptr[b->used++] = hex_chars[(in[i] >> 4) & 0x0F];
 		b->ptr[b->used++] = hex_chars[in[i] & 0x0F];
 	}
 	b->ptr[b->used++] = '\0';
-	
+
 	return 0;
 }
 
@@ -624,7 +624,7 @@ const char encoded_chars_rel_uri_part[] = {
 	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
 	*/
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  00 -  0F control chars */
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */ 
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */
 	1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1,  /*  20 -  2F space " # $ % & ' + , / */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,  /*  30 -  3F : ; = ? @ < > */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /*  40 -  4F */
@@ -646,7 +646,7 @@ const char encoded_chars_rel_uri[] = {
 	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
 	*/
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  00 -  0F control chars */
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */ 
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */
 	1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0,  /*  20 -  2F space " # $ % & ' + , / */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,  /*  30 -  3F : ; = ? @ < > */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /*  40 -  4F */
@@ -668,7 +668,7 @@ const char encoded_chars_html[] = {
 	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
 	*/
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  00 -  0F control chars */
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */ 
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */
 	0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /*  20 -  2F & */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0,  /*  30 -  3F < > */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /*  40 -  4F */
@@ -690,7 +690,7 @@ const char encoded_chars_minimal_xml[] = {
 	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
 	*/
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  00 -  0F control chars */
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */ 
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */
 	0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /*  20 -  2F & */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0,  /*  30 -  3F < > */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /*  40 -  4F */
@@ -712,12 +712,12 @@ const char encoded_chars_hex[] = {
 	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
 	*/
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  00 -  0F control chars */
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */ 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  20 -  2F */ 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  30 -  3F */ 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  40 -  4F */ 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  50 -  5F */ 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  60 -  6F */ 
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  10 -  1F */
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  20 -  2F */
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  30 -  3F */
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  40 -  4F */
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  50 -  5F */
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  60 -  6F */
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  70 -  7F */
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  80 -  8F */
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  90 -  9F */
@@ -734,13 +734,13 @@ int buffer_append_string_encoded(buffer *b, const char *s, size_t s_len, buffer_
 	unsigned char *ds, *d;
 	size_t d_len, ndx;
 	const char *map = NULL;
-	
+
 	if (!s || !b) return -1;
-	
+
 	if (b->ptr[b->used - 1] != '\0') {
 		SEGFAULT();
 	}
-	
+
 	if (s_len == 0) return 0;
 
 	switch(encoding) {
@@ -764,7 +764,7 @@ int buffer_append_string_encoded(buffer *b, const char *s, size_t s_len, buffer_
 	}
 
 	assert(map != NULL);
-	
+
 	/* count to-be-encoded-characters */
 	for (ds = (unsigned char *)s, d_len = 0, ndx = 0; ndx < s_len; ds++, ndx++) {
 		if (map[*ds]) {
@@ -787,9 +787,9 @@ int buffer_append_string_encoded(buffer *b, const char *s, size_t s_len, buffer_
 			d_len ++;
 		}
 	}
-	
+
 	buffer_prepare_append(b, d_len);
-	
+
 	for (ds = (unsigned char *)s, d = (unsigned char *)b->ptr + b->used - 1, d_len = 0, ndx = 0; ndx < s_len; ds++, ndx++) {
 		if (map[*ds]) {
 			switch(encoding) {
@@ -820,9 +820,9 @@ int buffer_append_string_encoded(buffer *b, const char *s, size_t s_len, buffer_
 		}
 	}
 
-	/* terminate buffer and calculate new length */ 
+	/* terminate buffer and calculate new length */
 	b->ptr[b->used + d_len - 1] = '\0';
-	
+
 	b->used += d_len;
 
 	return 0;
@@ -854,10 +854,10 @@ static int buffer_urldecode_internal(buffer *url, int is_query) {
 				low = hex2int(*(src + 2));
 				if (low != 0xFF) {
 					high = (high << 4) | low;
-					
-					/* map control-characters out */	
+
+					/* map control-characters out */
 					if (high < 32 || high == 127) high = '_';
-					
+
 					*dst = high;
 					src += 2;
 				}
@@ -925,7 +925,7 @@ int buffer_path_simplify(buffer *dest, buffer *src)
 	}
 	walk = src->ptr;
 #endif
-	
+
 	while (*walk == ' ') {
 		walk++;
 	}
@@ -991,7 +991,7 @@ int light_isdigit(int c) {
 
 int light_isxdigit(int c) {
 	if (light_isdigit(c)) return 1;
-	
+
 	c |= 32;
 	return (c >= 'a' && c <= 'f');
 }
@@ -1007,29 +1007,29 @@ int light_isalnum(int c) {
 
 int buffer_to_lower(buffer *b) {
 	char *c;
-	
+
 	if (b->used == 0) return 0;
-	
+
 	for (c = b->ptr; *c; c++) {
 		if (*c >= 'A' && *c <= 'Z') {
 			*c |= 32;
 		}
 	}
-	
+
 	return 0;
 }
 
 
 int buffer_to_upper(buffer *b) {
 	char *c;
-	
+
 	if (b->used == 0) return 0;
-	
+
 	for (c = b->ptr; *c; c++) {
 		if (*c >= 'a' && *c <= 'z') {
 			*c &= ~32;
 		}
 	}
-	
+
 	return 0;
 }