projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
lib
/
strndup.c
diff --git
a/lib/strndup.c
b/lib/strndup.c
index
366a4eb
..
b44db25
100644
(file)
--- a/
lib/strndup.c
+++ b/
lib/strndup.c
@@
-1,7
+1,7
@@
-/*
Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc
.
+/*
A replacement function, for systems that lack strndup
.
- NOTE: The canonical source of this file is maintained with the GNU C Library.
-
Bugs can be reported to bug-glibc@prep.ai.mit.edu
.
+ Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 Free Software
+
Foundation, Inc
.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@
-14,32
+14,16
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
-#include <stdlib.h>
#include <string.h>
#include <string.h>
-#ifndef HAVE_DECL_STRNLEN
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_STRNLEN
-size_t strnlen ();
-#endif
-
-#undef __strndup
-#undef strndup
-
-#ifndef weak_alias
-# define __strndup strndup
-#endif
+#include <stdlib.h>
char *
char *
-
__strndup (const char
*s, size_t n)
+
strndup (char const
*s, size_t n)
{
size_t len = strnlen (s, n);
char *new = malloc (len + 1);
{
size_t len = strnlen (s, n);
char *new = malloc (len + 1);
@@
-50,6
+34,3
@@
__strndup (const char *s, size_t n)
new[len] = '\0';
return memcpy (new, s, len);
}
new[len] = '\0';
return memcpy (new, s, len);
}
-#ifdef weak_alias
-weak_alias (__strndup, strndup)
-#endif