X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=xmalloc.c;h=6107564d93eb51731e966c89eec8c396e7fed3b8;hb=b5a52578dc64a15121c49c72f1441e15603edcf4;hp=8e085b0c85f1e30903dfe3672c343c0aa3fca8b7;hpb=28b12aba4ad1b56c1acfea4e20c1a81b91221d45;p=~andy%2Ffetchmail

diff --git a/xmalloc.c b/xmalloc.c
index 8e085b0c..6107564d 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,43 +1,42 @@
 /*
  * xmalloc.c -- allocate space or die 
  *
+ * Copyright 1998 by Eric S. Raymond.
  * For license terms, see the file COPYING in this directory.
  */
 
-#include <config.h>
+#include "config.h"
+#include <sys/types.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#if defined(STDC_HEADERS)
 #include  <stdlib.h>
-#endif
 #include "fetchmail.h"
+#include "gettext.h"
 
-#if defined(HAVE_VOIDPOINTER)
-#define XMALLOCTYPE void
-#else
-#define XMALLOCTYPE char
-#endif
-
-XMALLOCTYPE *
-xmalloc (int n)
+void *xmalloc (size_t n)
 {
-    XMALLOCTYPE *p;
+    void *p;
 
-    p = (XMALLOCTYPE *) malloc(n);
-    if (p == (XMALLOCTYPE *) 0)
-	error(PS_UNDEFINED, errno, "malloc failed");
+    p = (void *) malloc(n);
+    if (p == (void *) 0)
+    {
+	report(stderr, GT_("malloc failed\n"));
+	abort();
+    }
     return(p);
 }
 
-XMALLOCTYPE *
-xrealloc (XMALLOCTYPE *p, int n)
+void *xrealloc (void *p, size_t n)
 {
     if (p == 0)
 	return xmalloc (n);
-    p = (XMALLOCTYPE *) realloc(p, n);
-    if (p == (XMALLOCTYPE *) 0)
-	error(PS_UNDEFINED, errno, "realloc failed");
+    p = (void *) realloc(p, n);
+    if (p == (void *) 0)
+    {
+	report(stderr, GT_("realloc failed\n"));
+	abort();
+    }
     return p;
 }
 
@@ -49,4 +48,17 @@ char *xstrdup(const char *s)
     return p;
 }
 
+char *xstrndup(const char *s, size_t len)
+{
+    char *p;
+    size_t l = strlen(s);
+
+    if (len < l) l = len;
+    p = (char *)xmalloc(l + 1);
+    memcpy(p, s, l);
+    p[l] = '\0';
+    return p;
+}
+
+
 /* xmalloc.c ends here */