X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=40e0ac28d6aa1cac4815d7af2b982d4de5c31add;hb=310f220f3dc11206e8c8374c2350d8e5f74c8427;hp=08dbeeaef0705cb77a44c8a6839b3d72e68c98ad;hpb=4e4563a1982c52a04ec71536ff127243aaa90449;p=gnulib.git

diff --git a/lib/strndup.c b/lib/strndup.c
index 08dbeeaef..40e0ac28d 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 
 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.
@@ -14,13 +14,16 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+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
 # include "config.h"
 #endif
 
+#include <stdio.h>
+#include <sys/types.h>
+
 #ifdef STDC_HEADERS
 # include <string.h>
 # include <stdlib.h>
@@ -30,17 +33,13 @@ char *malloc ();
 
 /* Duplicate S, returning an identical malloc'd string.  */
 char *
-strndup (s, n)
-     const char *s;
-     size_t n;
+strndup (const char *s, size_t n)
 {
   char *new = malloc (n + 1);
 
   if (new == NULL)
     return NULL;
 
-  memcpy (new, s, n);
   new[n] = '\0';
-
-  return new;
+  return (char *) memcpy (new, s, n);
 }