Attempt merging from 6.3.24.

[~andy/fetchmail] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index 6fab5be1096d36966a65569c55041d5196c19eba..6107564d93eb51731e966c89eec8c396e7fed3b8 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,42 +1,64 @@
 /*
  * 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>
-#include <sys/types.h>
+#include  <stdlib.h>
 #include "fetchmail.h"
+#include "gettext.h"
+
+void *xmalloc (size_t n)
+{
+    void *p;
 
-#if defined(HAVE_VOIDPOINTER)
-#define XMALLOCTYPE void
-#else
-#define XMALLOCTYPE char
-#endif
+    p = (void *) malloc(n);
+    if (p == (void *) 0)
+    {
+       report(stderr, GT_("malloc failed\n"));
+       abort();
+    }
+    return(p);
+}
 
-XMALLOCTYPE *
-xmalloc (n)
-int n;
+void *xrealloc (void *p, size_t n)
 {
-  XMALLOCTYPE *p;
-
-  p = (XMALLOCTYPE *) malloc(n);
-  if (p == (XMALLOCTYPE *) 0) {
-    fputs("fetchmail: malloc failed\n",stderr);
-    exit(PS_UNDEFINED);
-  }
-  return(p);
+    if (p == 0)
+       return xmalloc (n);
+    p = (void *) realloc(p, n);
+    if (p == (void *) 0)
+    {
+       report(stderr, GT_("realloc failed\n"));
+       abort();
+    }
+    return p;
 }
 
-char *xstrdup(s)
-char *s;
-{ 
-  char *p;
-  p = (char *) xmalloc(strlen(s)+1);
-  strcpy(p,s);
-  return p;
+char *xstrdup(const char *s)
+{
+    char *p;
+    p = (char *) xmalloc(strlen(s)+1);
+    strcpy(p,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 */