From de6b062321f6631c49119190dc63b00a566148df Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 28 Jun 1996 11:42:05 +0000 Subject: Fri Jun 28 07:27:10 1996 Roland McGrath * string/strndup.c (strndup): Always terminate the string. * string/string.h (strndupa): Likewise. Thu Jun 27 14:22:31 1996 Andreas Schwab * stdio/Makefile (routines): Add vscanf. * stdio-common/Makefile (routines): Remove vscanf. * stdio-common/vscanf.c: Move to ... * stdio/vscanf.c: here. * rpm/Makefile (headers, install-lib, install-lib.so, versioned, install-bin, install-sbin, install-data, install-others): Add $(-VARIABLE). --- string/string.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'string/string.h') diff --git a/string/string.h b/string/string.h index 3b6c5e969b..7dbcc41c22 100644 --- a/string/string.h +++ b/string/string.h @@ -107,8 +107,11 @@ extern char *strndup __P ((__const char *__string, size_t __n)); #define strndupa(s, n) \ ({ \ __const char *__old = (s); \ - size_t __len = strnlen (__old) + 1; \ - memcpy (__builtin_alloca (__len), __old, __len); \ + char *__new; \ + size_t __len = strnlen (__old); \ + __new = memcpy (__builtin_alloca (__len + 1), __old, __len); \ + __new[__len] = '\0'; \ + __new; \ }) #endif -- cgit v1.2.3