X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=common%2Futils.c;h=d82f3c3cd47b4952085127f16ef8366aee87fe9a;hb=302a260054ea38d3cb97be6d1a3010082c09265d;hp=5c909ecadb98dec5466deb4ba6ac6125b6891cb1;hpb=1df8650c384f64c1100e412adc60dd0b33fad3c1;p=doldaconnect.git

diff --git a/common/utils.c b/common/utils.c
index 5c909ec..d82f3c3 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -79,14 +79,19 @@ char *vsprintf2(char *format, va_list al)
 {
     int ret;
     char *buf;
+    va_list al2;
     
-    ret = vsnprintf(NULL, 0, format, al);
+    va_copy(al2, al);
+    ret = vsnprintf(NULL, 0, format, al2);
+    va_end(al2);
     if((buf = malloc(ret + 1)) == NULL)
     {
 	LOGOOM(ret + 1);
 	return(NULL);
     }
-    vsnprintf(buf, ret + 1, format, al);
+    va_copy(al2, al);
+    vsnprintf(buf, ret + 1, format, al2);
+    va_end(al2);
     return(buf);
 }
 
@@ -106,10 +111,18 @@ wchar_t *vswprintf2(wchar_t *format, va_list al)
     int ret;
     wchar_t *buf;
     size_t bufsize;
+    va_list al2;
     
     buf = smalloc(sizeof(wchar_t) * (bufsize = 1024));
-    while((ret = vswprintf(buf, bufsize, format, al)) < 0)
+    while(1)
+    {
+	va_copy(al2, al);
+	ret = vswprintf(buf, bufsize, format, al2);
+	va_end(al2);
+	if(ret >= 0)
+	    break;
 	buf = srealloc(buf, sizeof(wchar_t) * (bufsize *= 2));
+    }
     if(bufsize > ret + 1)
 	buf = srealloc(buf, sizeof(wchar_t) * (ret + 1));
     return(buf);
@@ -428,11 +441,7 @@ int wcsexists(wchar_t *h, wchar_t *n)
 #ifndef HAVE_WCSCASECMP
 int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
 {
-    while(towlower(*s1) == towlower(*s2))
-    {
-	if(*s1 == L'\0')
-	    return(0);
-    }
+    for(; (towlower(*s1) == towlower(*s2)) && (*s1 != L'\0'); s1++, s2++);
     return(towlower(*s1) - towlower(*s2));
 }
 #endif
@@ -466,41 +475,39 @@ char *hexencode(char *data, size_t datalen)
 
 char *hexdecode(char *data, size_t *len)
 {
-    char *buf, this;
+    char *buf, this, bit;
     size_t bufsize, bufdata;
     
     buf = NULL;
     bufsize = bufdata = 0;
-    for(; *data; data++)
+    for(bit = 4, this = 0; *data; data++)
     {
 	if((*data >= 'A') && (*data <= 'F'))
 	{
-	    this = (this & 0x0F) | ((*data - 'A' + 10) << 4);
+	    this |= (this & 0x0F) | ((*data - 'A' + 10) << bit);
+	} else if((*data >= 'a') && (*data <= 'f')) {
+	    this |= (this & 0x0F) | ((*data - 'a' + 10) << bit);
 	} else if((*data >= '0') && (*data <= '9')) {
-	    this = (this & 0x0F) | ((*data - '0') << 4);
+	    this |= (this & 0x0F) | ((*data - '0') << bit);
+	} else if(*data == '\n') {
+	    continue;
 	} else {
 	    if(buf != NULL)
 		free(buf);
 	    return(NULL);
 	}
-	data++;
-	if(!*data)
-	{
-	    if(buf != NULL)
-		free(buf);
-	    return(NULL);
-	}
-	if((*data >= 'A') && (*data <= 'F'))
-	{
-	    this = (this & 0xF0) | (*data - 'A' + 10);
-	} else if((*data >= '0') && (*data <= '9')) {
-	    this = (this & 0xF0) | (*data - '0');
+	if(bit == 4) {
+	    bit = 0;
 	} else {
-	    if(buf != NULL)
-		free(buf);
-	    return(NULL);
+	    bit = 4;
+	    addtobuf(buf, this);
+	    this = 0;
 	}
-	addtobuf(buf, this);
+    }
+    if(bit != 4) {
+	if(buf != NULL)
+	    free(buf);
+	return(NULL);
     }
     addtobuf(buf, 0);
     if(len != NULL)
@@ -794,6 +801,51 @@ char *findfile(char *name, char *homedir, int filldef)
     }
 }
 
+struct strpair *newstrpair(char *key, char *val, struct strpair **list)
+{
+    struct strpair *pair;
+    
+    pair = smalloc(sizeof(*pair));
+    memset(pair, 0, sizeof(*pair));
+    if(key != NULL)
+	pair->key = sstrdup(key);
+    if(val != NULL)
+	pair->val = sstrdup(val);
+    if(list != NULL)
+    {
+	pair->next = *list;
+	*list = pair;
+    }
+    return(pair);
+}
+
+void freestrpair(struct strpair *pair, struct strpair **list)
+{
+    struct strpair *cur;
+    
+    for(cur = *list; cur != NULL; list = &(cur->next), cur = cur->next)
+    {
+	if(cur == pair)
+	{
+	    *list = cur->next;
+	    break;
+	}
+    }
+    free(pair->key);
+    free(pair->val);
+    free(pair);
+}
+
+char *spfind(struct strpair *list, char *key)
+{
+    for(; list != NULL; list = list->next)
+    {
+	if(!strcmp(list->key, key))
+	    return(list->val);
+    }
+    return(NULL);
+}
+
 struct wcspair *newwcspair(wchar_t *key, wchar_t *val, struct wcspair **list)
 {
     struct wcspair *pair;
@@ -804,10 +856,8 @@ struct wcspair *newwcspair(wchar_t *key, wchar_t *val, struct wcspair **list)
 	pair->key = swcsdup(key);
     if(val != NULL)
 	pair->val = swcsdup(val);
-    if(list == NULL)
+    if(list != NULL)
     {
-	pair->next = NULL;
-    } else {
 	pair->next = *list;
 	*list = pair;
     }