Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / safe_strncpy.c

diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
index 42bc16e..5eb0db0 100644 (file)
--- a/libbb/safe_strncpy.c
+++ b/libbb/safe_strncpy.c
@@ -4,18 +4,29 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#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)
+{
+       /* Cheap optimization for dst == src case -
+        * better to have it here than in many callers.
+        */
+       if (dst != src) {
+               while ((*dst = *src) != '\0') {
+                       dst++;
+                       src++;
+               }
+       }
+}