X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=xmalloc.c;h=3a34e1ce187a864a029c434a221a4c4fd2fbe0db;hb=0e98461940cbb36816b14dc54a0defa1ed0fc920;hp=bc22a97b19faa6867ee9f8535a5b0ea52d3e2a3b;hpb=384a832f989722381d0ad998a87d52f2ce05b714;p=pkg%2Fabook.git

diff --git a/xmalloc.c b/xmalloc.c
index bc22a97..3a34e1c 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -36,11 +36,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "gettext.h"
+#include "xmalloc.h"
 
 static void
 xmalloc_default_error_handler(int err)
 {
-	fprintf(stderr, "Memory allocation failure: %s\n", strerror(err));
+	fprintf(stderr, _("Memory allocation failure: %s\n"), strerror(err));
 	exit(EXIT_FAILURE);
 }
 
@@ -134,10 +136,34 @@ xrealloc_inc(void *ptr, size_t size, size_t inc)
 	return ptr;
 }
 
-void
-xfree(void *ptr)
+char *
+xstrdup(const char *s)
 {
-	free(ptr);
-	ptr = NULL;
+	size_t len = strlen(s);
+	void *new;
+
+	new = xmalloc_inc(len, 1);
+	if(new == NULL)
+		return NULL;
+
+	return (char *)memcpy(new, s, len + 1);
 }
 
+char *
+xstrndup(const char *s, size_t len)
+{
+	char *new;
+	size_t n = strlen(s);
+
+	if(n > len)
+		n = len;
+
+	new = xmalloc_inc(n, 1);
+	if(new == NULL)
+		return NULL;
+
+	memcpy(new, s, n);
+	new[n] = '\0';
+
+	return new;
+}