X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstpncpy.c;h=ca53ebbd133a49a5eb815eba603db6956d48c33a;hb=d0ed135f8b494a0adf869a311c7bdc1d9d03f050;hp=445128aacd4602ffa358fdc86f5940e5114450f7;hpb=b063d68090f35feeadd0ee28d0109caa89625df0;p=gnulib.git
diff --git a/lib/stpncpy.c b/lib/stpncpy.c
index 445128aac..ca53ebbd1 100644
--- a/lib/stpncpy.c
+++ b/lib/stpncpy.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2010 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@gnu.org.
- This program is free software; you can redistribute it and/or modify it
+ 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
- Free Software Foundation; either version 2, or (at your option) any
+ Free Software Foundation; either version 3 of the License, or any
later version.
This program is distributed in the hope that it will be useful,
@@ -14,17 +15,14 @@
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 . */
/* This is almost copied from strncpy.c, written by Torbjorn Granlund. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
-#include "stpncpy.h"
+#include
#ifndef weak_alias
# define __stpncpy stpncpy
@@ -43,26 +41,26 @@ __stpncpy (char *dest, const char *src, size_t n)
size_t n4 = n >> 2;
for (;;)
- {
- c = *src++;
- *dest++ = c;
- if (c == '\0')
- break;
- c = *src++;
- *dest++ = c;
- if (c == '\0')
- break;
- c = *src++;
- *dest++ = c;
- if (c == '\0')
- break;
- c = *src++;
- *dest++ = c;
- if (c == '\0')
- break;
- if (--n4 == 0)
- goto last_chars;
- }
+ {
+ c = *src++;
+ *dest++ = c;
+ if (c == '\0')
+ break;
+ c = *src++;
+ *dest++ = c;
+ if (c == '\0')
+ break;
+ c = *src++;
+ *dest++ = c;
+ if (c == '\0')
+ break;
+ c = *src++;
+ *dest++ = c;
+ if (c == '\0')
+ break;
+ if (--n4 == 0)
+ goto last_chars;
+ }
n -= dest - s;
goto zero_fill;
}
@@ -78,9 +76,9 @@ __stpncpy (char *dest, const char *src, size_t n)
--n;
*dest++ = c;
if (c == '\0')
- break;
+ break;
if (n == 0)
- return dest;
+ return dest;
}
zero_fill: