#include <string.h>
#include <assert.h>
#include <stdio.h>
+#include <unistd.h>
#include "malloc.h"
+#ifndef va_copy
+#ifdef __va_copy
+#define va_copy(DEST,SRC) __va_copy((DEST),(SRC))
+#else
+#define va_copy(DEST,SRC) memcpy(&(DEST), &(SRC), sizeof(va_list))
+#endif
+#endif
+
static const AvahiAllocator *allocator = NULL;
+static void oom(void) AVAHI_GCC_NORETURN;
+
+static void oom(void) {
+
+ static const char msg[] = "Out of memory, aborting ...\n";
+ const char *n = msg;
+
+ while (strlen(n) > 0) {
+ ssize_t r;
+
+ if ((r = write(2, n, strlen(n))) < 0)
+ break;
+
+ n += r;
+ }
+
+ abort();
+}
+
+/* Default implementation for avahi_malloc() */
+static void* xmalloc(size_t size) {
+ void *p;
+
+ if (size == 0)
+ return NULL;
+
+ if (!(p = malloc(size)))
+ oom();
+
+ return p;
+}
+
+/* Default implementation for avahi_realloc() */
+static void *xrealloc(void *p, size_t size) {
+
+ if (size == 0) {
+ free(p);
+ return NULL;
+ }
+
+ if (!(p = realloc(p, size)))
+ oom();
+
+ return p;
+}
+
+/* Default implementation for avahi_calloc() */
+static void *xcalloc(size_t nmemb, size_t size) {
+ void *p;
+
+ if (size == 0 || nmemb == 0)
+ return NULL;
+
+ if (!(p = calloc(nmemb, size)))
+ oom();
+
+ return p;
+}
+
void *avahi_malloc(size_t size) {
if (size <= 0)
return NULL;
if (!allocator)
- return malloc(size);
+ return xmalloc(size);
assert(allocator->malloc);
return allocator->malloc(size);
return NULL;
if (!allocator)
- return calloc(1, size);
+ return xcalloc(1, size);
if (allocator->calloc)
return allocator->calloc(1, size);
void *avahi_realloc(void *p, size_t size) {
+ if (size == 0) {
+ avahi_free(p);
+ return NULL;
+ }
+
if (!allocator)
- return realloc(p, size);
+ return xrealloc(p, size);
assert(allocator->realloc);
return allocator->realloc(p, size);
char *avahi_strndup(const char *s, size_t max) {
char *r;
size_t size;
+ const char *p;
if (!s)
return NULL;
- size = strlen(s);
-
- if (size > max)
- size = max;
+ for (p = s, size = 0;
+ size < max && *p;
+ p++, size++);
- if (!(r = avahi_malloc(size+1)))
+ if (!(r = avahi_new(char, size+1)))
return NULL;
memcpy(r, s, size);
}
char *avahi_strdup_vprintf(const char *fmt, va_list ap) {
- size_t len = 100;
+ size_t len = 80;
char *buf;
assert(fmt);
for (;;) {
int n;
char *nbuf;
-
- n = vsnprintf(buf, len, fmt, ap);
+ va_list ap2;
+
+ va_copy (ap2, ap);
+ n = vsnprintf(buf, len, fmt, ap2);
+ va_end (ap2);
if (n >= 0 && n < (int) len)
return buf;
char *avahi_strdup_printf(const char *fmt, ... ) {
char *s;
va_list ap;
+
+ assert(fmt);
va_start(ap, fmt);
s = avahi_strdup_vprintf(fmt, ap);
return s;
}
+void *avahi_memdup(const void *s, size_t l) {
+ void *p;
+ assert(s);
+
+ if (!(p = avahi_malloc(l)))
+ return NULL;
+
+ memcpy(p, s, l);
+ return p;
+}