X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=xmalloc.c;h=3a34e1ce187a864a029c434a221a4c4fd2fbe0db;hb=b1c882049db5d6d7d5770134cd93e14934ace6c1;hp=d291f4dd76149b86679cb29e51691ca0fb72cbc6;hpb=a4028acb18fd04cbf03ddbd976115aeb04ddd867;p=pkg%2Fabook.git diff --git a/xmalloc.c b/xmalloc.c index d291f4d..3a34e1c 100644 --- a/xmalloc.c +++ b/xmalloc.c @@ -36,12 +36,13 @@ #include #include #include +#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); } @@ -135,3 +136,34 @@ xrealloc_inc(void *ptr, size_t size, size_t inc) return ptr; } +char * +xstrdup(const char *s) +{ + 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; +}