From d4d36b0a9a778caec77fb8e4ce5b1e406d5a8f50 Mon Sep 17 00:00:00 2001 From: drath Date: Sun, 25 Jun 2006 20:44:25 +0000 Subject: - changed use of bzero (deprecated) to memset (thanks to Spen for pointing this out) - changed fallback implementation of strndup to something that works on all systems (thanks to Spen for this patch) git-svn-id: svn://svn.berlios.de/openocd/trunk@75 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/server/gdb_server.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/server/gdb_server.c') diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index e8664bb2..b0c09961 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -32,14 +32,18 @@ #include #include -// -ino: 060521-1116 #ifndef HAVE_STRNDUP #include -char * strndup(char * str, int n) { - unsigned char * tmp = malloc((size_t)n+1); - if (! tmp) perror("gdb_server malloc failed"); - if (strlcpy(tmp, str, n) > n) perror("gdb_server strndup: too long"); - return tmp; +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 -- cgit v1.2.3