X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcmem.c;h=17535d874c013e25c1a528d3bb0760e3b42a176f;hp=6c6ae12bca5ef0ed4dd9d4de6c8bfc29bc911ac6;hb=c8fdd78cfb5ba3a2afcdbb95e69e49d1c0dc23ed;hpb=1708c99d4b6263863304d48ebca3b3473d6a0112

diff --git a/src/cmem.c b/src/cmem.c
index 6c6ae12..17535d8 100644
--- a/src/cmem.c
+++ b/src/cmem.c
@@ -1,11 +1,6 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
 #include "cmem.h"
 
-void *malloc_chk(size_t size, char *tag)
+void *malloc_chk(size_t size, const char *tag)
 {
     void *p;
 
@@ -36,3 +31,18 @@ char *strdup_chk(const char *s, char *tag)
     strcpy(t, s);
     return t;
 }
+
+char *strndup_chk(const char *s, size_t len, char *tag)
+{
+    assert(s != NULL);
+    char *t;
+
+    if(len < strlen(s)) {
+        t = malloc_chk(len + 1, tag);
+        strncpy(t, s, len);
+        t[len] = '\0';
+    } else {
+        t = strdup_chk(s, tag);
+    }
+    return t;
+}