/*
dropin.c -- a set of drop-in replacements for libc functions
- Copyright (C) 2000-2003 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 2000-2005 Ivo Timmermans,
+ 2000-2006 Guus Sliepen <guus@tinc-vpn.org>
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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: dropin.c,v 1.1.2.17 2003/07/28 22:06:09 guus Exp $
+ $Id$
*/
#include "system.h"
#endif
#ifndef HAVE_ASPRINTF
-int asprintf(char **buf, const char *fmt, ...)
+int asprintf(char **buf, const char *fmt, ...) {
+ int result;
+ va_list ap;
+ va_start(ap, fmt);
+ result = vasprintf(buf, fmt, ap);
+ va_end(ap);
+ return result;
+}
+
+int vasprintf(char **buf, const char *fmt, va_list ap) {
{
int status;
- va_list ap;
+ va_list aq;
int len;
len = 4096;
*buf = xmalloc(len);
- va_start(ap, fmt);
- status = vsnprintf(*buf, len, fmt, ap);
- va_end(ap);
+ va_copy(aq, ap);
+ status = vsnprintf(*buf, len, fmt, aq);
+ va_end(aq);
if(status >= 0)
- *buf = xrealloc(*buf, status);
+ *buf = xrealloc(*buf, status + 1);
if(status > len - 1) {
len = status;
- va_start(ap, fmt);
- status = vsnprintf(*buf, len, fmt, ap);
- va_end(ap);
+ va_copy(aq, ap);
+ status = vsnprintf(*buf, len, fmt, aq);
+ va_end(aq);
}
return status;
return 0;
}
#endif
+
+#ifndef HAVE_RANDOM
+#include <openssl/rand.h>
+
+long int random(void) {
+ long int x;
+
+ RAND_pseudo_bytes((unsigned char *)&x, sizeof(x));
+
+ return x;
+}
+#endif