traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / libbb / safe_strncpy.c

diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
index add92ac9f735c096ca5187c7b2130c891e64434b..4acd9766ba7c896076826e0f538d7fddc55af8f2 100644 (file)
--- a/libbb/safe_strncpy.c
+++ b/libbb/safe_strncpy.c
@@ -7,14 +7,21 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <string.h>
 #include "libbb.h"
 
-
-
 /* Like strncpy but make sure the resulting string is always 0 terminated. */
-char * safe_strncpy(char *dst, const char *src, size_t size)
+char* FAST_FUNC safe_strncpy(char *dst, const char *src, size_t size)
+{
+       if (!size) return dst;
+       dst[--size] = '\0';
+       return strncpy(dst, src, size);
+}
+
+/* Like strcpy but can copy overlapping strings. */
+void FAST_FUNC overlapping_strcpy(char *dst, const char *src)
 {
-       dst[size-1] = '\0';
-       return strncpy(dst, src, size-1);
+       while ((*dst = *src) != '\0') {
+               dst++;
+               src++;
+       }
 }