Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/safe_strncpy.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/safe_strncpy.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/safe_strncpy.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -11 +11 @@
 
 /* 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;
@@ -17 +17 @@
     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++;
+        }
+    }
+}