diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/Makefile | 3 | ||||
| -rw-r--r-- | string/strdup.c | 12 | ||||
| -rw-r--r-- | string/string.h | 23 | ||||
| -rw-r--r-- | string/strndup.c | 37 |
4 files changed, 62 insertions, 13 deletions
diff --git a/string/Makefile b/string/Makefile index 99106c4583..f67e7247d4 100644 --- a/string/Makefile +++ b/string/Makefile @@ -24,7 +24,8 @@ subdir := string headers := string.h strings.h memory.h endian.h bytesex.h \ argz.h envz.h -routines := strcat strchr strcmp strcoll strcpy strcspn strdup \ +routines := strcat strchr strcmp strcoll strcpy strcspn \ + strdup strndup \ strerror _strerror strerror_r strlen strnlen \ strncat strncmp strncpy \ strrchr strpbrk strsignal strspn strstr strtok \ diff --git a/string/strdup.c b/string/strdup.c index 2c8aff2796..3e9eee0945 100644 --- a/string/strdup.c +++ b/string/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <stddef.h> #include <stdlib.h> #include <string.h> @@ -24,15 +23,16 @@ Cambridge, MA 02139, USA. */ /* Duplicate S, returning an identical malloc'd string. */ char * -DEFUN(strdup, (s), CONST char *s) +__strdup (const char *s) { - size_t len = strlen(s) + 1; - PTR new = malloc(len); + size_t len = strlen (s) + 1; + void *new = malloc (len); if (new == NULL) return NULL; - memcpy(new, (PTR) s, len); + memcpy (new, s, len); return (char *) new; } +weak_alias (__strdup, strdup) diff --git a/string/string.h b/string/string.h index a5a6edd398..3b6c5e969b 100644 --- a/string/string.h +++ b/string/string.h @@ -49,9 +49,6 @@ extern __ptr_t __memccpy __P ((__ptr_t __dest, __const __ptr_t __src, #if defined (__USE_SVID) || defined (__USE_BSD) extern __ptr_t memccpy __P ((__ptr_t __dest, __const __ptr_t __src, int __c, size_t __n)); -#ifdef __OPTIMIZE__ -#define memccpy(dest, src, c, n) __memccpy((dest), (src), (c), (n)) -#endif /* Optimizing. */ #endif /* SVID. */ @@ -88,6 +85,7 @@ extern size_t strxfrm __P ((char *__dest, __const char *__src, size_t __n)); #if defined (__USE_SVID) || defined (__USE_BSD) /* Duplicate S, returning an identical malloc'd string. */ +extern char *__strdup __P ((__const char *__s)); extern char *strdup __P ((__const char *__s)); #endif @@ -95,9 +93,22 @@ extern char *strdup __P ((__const char *__s)); /* Duplicate S, returning an identical alloca'd string. */ #define strdupa(s) \ ({ \ - const char *__old = (s); \ - size_t __len = strlen (__old) + 1; \ - memcpy (__builtin_alloca (__len), __old, __len); \ + __const char *__old = (s); \ + size_t __len = strlen (__old) + 1; \ + memcpy (__builtin_alloca (__len), __old, __len); \ +}) + +/* Return a malloc'd copy of at most N bytes of STRING. The + resultant string is terminated even if no null terminator + appears before STRING[N]. */ +extern char *strndup __P ((__const char *__string, size_t __n)); + +/* Return an alloca'd copy of at most N bytes of string. */ +#define strndupa(s, n) \ +({ \ + __const char *__old = (s); \ + size_t __len = strnlen (__old) + 1; \ + memcpy (__builtin_alloca (__len), __old, __len); \ }) #endif diff --git a/string/strndup.c b/string/strndup.c new file mode 100644 index 0000000000..213a0c056b --- /dev/null +++ b/string/strndup.c @@ -0,0 +1,37 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include <stddef.h> +#include <stdlib.h> +#include <string.h> + + +char * +strndup (const char *s, size_t n) +{ + size_t len = strnlen (s) + 1; + char *new = malloc (len); + + if (new == NULL) + return NULL; + + memcpy (new, s, len); + + return new; +} + |