X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fsafe_strncpy.c;h=42bc16ea0d07acfddf27f148b36477881dfd6820;hb=966ec7c067d7a2df5232a69c8d3d2e777347a62d;hp=d4275698cc9f14763f3ff6ce62d9dc0b2098e463;hpb=dfba741457cc81eb2ed3a9d4c074fbad74aa3249;p=oweals%2Fbusybox.git

diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
index d4275698c..42bc16ea0 100644
--- a/libbb/safe_strncpy.c
+++ b/libbb/safe_strncpy.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * 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, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <string.h>
@@ -27,16 +15,7 @@
 /* Like strncpy but make sure the resulting string is always 0 terminated. */
 char * safe_strncpy(char *dst, const char *src, size_t size)
 {
-	dst[size-1] = '\0';
-	return strncpy(dst, src, size-1);
+	if (!size) return dst;
+	dst[--size] = '\0';
+	return strncpy(dst, src, size);
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/