libarchive: open_zipped() does not need to check extensions for e.g. gzip

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

diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
index add92ac9f735c096ca5187c7b2130c891e64434b..5eb0db0bd4c5732e47e94eadd94d0fa403525b33 100644 (file)
--- a/libbb/safe_strncpy.c
+++ b/libbb/safe_strncpy.c
@@ -4,17 +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)
 {
-       dst[size-1] = '\0';
-       return strncpy(dst, src, size-1);
+       /* Cheap optimization for dst == src case -
+        * better to have it here than in many callers.
+        */
+       if (dst != src) {
+               while ((*dst = *src) != '\0') {
+                       dst++;
+                       src++;
+               }
+       }
 }