X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu-stpncpy.h;h=408a5dc3bd96bf4527962f5b6ab2bb7dd20d6efc;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=09bf434ce3a5745b8ffa7ad4536ada6c76e6634e;hpb=ac5cf7982cea8a4bb17680b6b9925f301cfa4220;p=gnulib.git

diff --git a/lib/unistr/u-stpncpy.h b/lib/unistr/u-stpncpy.h
index 09bf434ce..408a5dc3b 100644
--- a/lib/unistr/u-stpncpy.h
+++ b/lib/unistr/u-stpncpy.h
@@ -1,5 +1,5 @@
 /* Copy UTF-8/UTF-16/UTF-32 string.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -23,8 +23,12 @@ FUNC (UNIT *dest, const UNIT *src, size_t n)
 
   /* This behavior is rarely useful, but it is here for consistency with
      strncpy and wcsncpy.  */
-  for (; n > 0; n--)
-    *dest++ = 0;
+  {
+    UNIT *destptr = dest;
 
-  return dest - 1;
+    for (; n > 0; n--)
+      *destptr++ = 0;
+  }
+
+  return dest;
 }