projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'free' module.
[gnulib.git]
/
lib
/
strdup.c
diff --git
a/lib/strdup.c
b/lib/strdup.c
index
7b73a50
..
52667e9
100644
(file)
--- a/
lib/strdup.c
+++ b/
lib/strdup.c
@@
-1,5
+1,7
@@
-/* strdup.c -- return a newly allocated copy of a string
- Copyright (C) 1990 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003 Free Software
+ Foundation, Inc.
+
+ This file is part of the GNU C Library.
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
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
@@
-11,33
+13,39
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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,
+ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#ifdef HAVE_CONFIG_H
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#
include <config.h>
#endif
#endif
-#ifdef STDC_HEADERS
-#include <string.h>
#include <stdlib.h>
#include <stdlib.h>
-#else
-char *malloc ();
-char *strcpy ();
-#endif
+#include <string.h>
-/* Return a newly allocated copy of STR,
- or 0 if out of memory. */
+#undef __strdup
+#undef strdup
+#ifndef weak_alias
+# define __strdup strdup
+#endif
+
+/* Duplicate S, returning an identical malloc'd string. */
char *
char *
-strdup (str)
- const char *str;
+__strdup (const char *s)
{
{
- char *newstr;
+ size_t len = strlen (s) + 1;
+ void *new = malloc (len);
+
+ if (new == NULL)
+ return NULL;
- newstr = (char *) malloc (strlen (str) + 1);
- if (newstr)
- strcpy (newstr, str);
- return newstr;
+ return (char *) memcpy (new, s, len);
}
}
+#ifdef libc_hidden_def
+libc_hidden_def (__strdup)
+#endif
+#ifdef weak_alias
+weak_alias (__strdup, strdup)
+#endif