|
|
|
@ -79,17 +79,23 @@ static char *
|
|
|
|
smprintf(const char *fmt, ...)
|
|
|
|
smprintf(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
va_list ap;
|
|
|
|
char tmp[120];
|
|
|
|
char *ret;
|
|
|
|
char *ret = NULL;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vsnprintf(tmp, sizeof(tmp)-1, fmt, ap);
|
|
|
|
len = vsnprintf(NULL, 0, fmt, ap);
|
|
|
|
tmp[strlen(tmp)+1] = '\0';
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
|
|
|
|
if (asprintf(&ret, "%s", tmp) < 0)
|
|
|
|
ret = malloc(++len);
|
|
|
|
return NULL;
|
|
|
|
if (ret == NULL) {
|
|
|
|
|
|
|
|
perror("malloc");
|
|
|
|
|
|
|
|
exit(1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
|
|
|
|
vsnprintf(ret, len, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|