Check for sys/uio.h, net/if_tun.h and net/if_tap.h

[tinc] / lib / xmalloc.c

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 150b1aa..e7541bd 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -21,6 +21,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -31,15 +32,7 @@ void *realloc ();
 void free ();
 #endif
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
-
+#include "gettext.h"
 #include "xalloc.h"
 
 #ifndef EXIT_FAILURE
@@ -94,6 +87,21 @@ xmalloc (n)
   return p;
 }
 
+/* Allocate N bytes of memory dynamically, and set it all to zero. */
+
+void *
+xmalloc_and_zero (n)
+     size_t n;
+{
+  void *p;
+
+  p = malloc (n);
+  if (p == 0)
+    xalloc_fail ((int)n);
+  memset (p, '\0', n);
+  return p;
+}
+
 /* Change the size of an allocated block of memory P to N bytes,
    with error checking.
    If P is NULL, run xmalloc.  */
@@ -109,6 +117,18 @@ xrealloc (p, n)
   return p;
 }
 
+/* Duplicate a string */
+
+char *xstrdup(const char *s)
+{
+  char *p;
+  
+  p = strdup(s);
+  if(!p)
+    xalloc_fail ((int)strlen(s));
+  return p;
+}
+
 #ifdef NOT_USED
 
 /* Allocate memory for N elements of S bytes, with error checking.  */