bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add strndup fallback function to libalpm util

Browse source 
The same fallback we are currently using in the pacman frontend.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-01-19 12:00:39 -06:00
parent b40c8e2922
commit aff3e63c45
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/libalpm/util.c
View file

@ -937,4 +937,26 @@ long _alpm_parsedate(const char *line)
return(atol(line)); return(atol(line));
} }
#ifndef HAVE_STRNDUP
/* A quick and dirty implementation derived from glibc */
static size_t strnlen(const char *s, size_t max)
{
register const char *p;
for(p = s; *p && max--; ++p);
return(p - s);
}
char *strndup(const char *s, size_t n)
{
size_t len = strnlen(s, n);
char *new = (char *) malloc(len + 1);
if (new == NULL)
return NULL;
new[len] = '\0';
return (char *) memcpy(new, s, len);
}
#endif
/* vim: set ts=2 sw=2 noet: */ /* vim: set ts=2 sw=2 noet: */

5
lib/libalpm/util.h
View file

@ -50,6 +50,7 @@
#define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) #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 */ /* 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 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) #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 *); char *strsep(char **, const char *);
#endif #endif
#ifndef HAVE_STRNDUP
char *strndup(const char *s, size_t n);
#endif
/* check exported library symbols with: nm -C -D <lib> */ /* check exported library symbols with: nm -C -D <lib> */
#define SYMEXPORT __attribute__((visibility("default"))) #define SYMEXPORT __attribute__((visibility("default")))
#define SYMHIDDEN __attribute__((visibility("internal"))) #define SYMHIDDEN __attribute__((visibility("internal")))