* 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>
{
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);
}
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);
#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
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)