From aff3e63c451ead18571a8abed56e911f71906fe6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 19 Jan 2011 12:00:39 -0600 Subject: Add strndup fallback function to libalpm util The same fallback we are currently using in the pacman frontend. Signed-off-by: Dan McGee --- lib/libalpm/util.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/libalpm/util.h') diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index be5c1d9b..015e9bf5 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -50,6 +50,7 @@ #define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) /* This strdup macro is NULL safe- copying NULL will yield NULL */ #define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) +#define STRNDUP(r, s, l, action) do { if(s != NULL) { r = strndup(s, l); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) #define FREE(p) do { free(p); p = NULL; } while(0) @@ -101,6 +102,10 @@ long _alpm_parsedate(const char *line); char *strsep(char **, const char *); #endif +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t n); +#endif + /* check exported library symbols with: nm -C -D */ #define SYMEXPORT __attribute__((visibility("default"))) #define SYMHIDDEN __attribute__((visibility("internal"))) -- cgit v1.2.3-24-g4f1b