X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=b610e40e666e2ac6a351ebe3fa2c2fbb3c69f9ed;hb=5e47a7f0ec2afe51c4c89bdf0696e0073bf786e1;hp=6bceed0815c506b1cb5891cfb3901ec36e337dce;hpb=611f228f0629c5af6e412ded54121501dc1856be;p=gnulib.git

diff --git a/lib/strndup.c b/lib/strndup.c
index 6bceed081..b610e40e6 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,8 +14,8 @@ 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"
@@ -42,8 +42,6 @@ strndup (s, n)
   if (new == NULL)
     return NULL;
 
-  memcpy (new, s, n);
   new[n] = '\0';
-
-  return new;
+  return (char *) memcpy (new, s, n);
 }