X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=xmalloc.c;h=c2ca4a66e932a32d99716d851914b13ca05da6f0;hb=edb8384a00f108b385d0df7ddfa5bd671a36f946;hp=4cd9d40e6500ee459ec0de0aaa5036bff3b63900;hpb=1e860ab7289ec6c2314c53a8b88b69a75b9d25b8;p=~andy%2Ffetchmail

diff --git a/xmalloc.c b/xmalloc.c
index 4cd9d40e..c2ca4a66 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -6,6 +6,7 @@
  */
 
 #include "config.h"
+#include <sys/types.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -22,29 +23,29 @@
 #endif
 
 XMALLOCTYPE *
-xmalloc (int n)
+xmalloc (size_t n)
 {
     XMALLOCTYPE *p;
 
     p = (XMALLOCTYPE *) malloc(n);
     if (p == (XMALLOCTYPE *) 0)
     {
-	report(stderr, _("malloc failed\n"));
-	exit(PS_UNDEFINED);
+	report(stderr, GT_("malloc failed\n"));
+	abort();
     }
     return(p);
 }
 
 XMALLOCTYPE *
-xrealloc (XMALLOCTYPE *p, int n)
+xrealloc (XMALLOCTYPE *p, size_t n)
 {
     if (p == 0)
 	return xmalloc (n);
     p = (XMALLOCTYPE *) realloc(p, n);
     if (p == (XMALLOCTYPE *) 0)
     {
-	report(stderr, _("realloc failed\n"));
-	exit(PS_UNDEFINED);
+	report(stderr, GT_("realloc failed\n"));
+	abort();
     }
     return p;
 }
@@ -62,9 +63,22 @@ char *strdup(const char *s)
 {
     char *p;
     p = (char *) malloc(strlen(s)+1);
-    strcpy(p,s);
+    if (p)
+	    strcpy(p,s);
     return p;
 }
 #endif /* !HAVE_STRDUP */
 
+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 */