git-merge --squash

diff --git a/path.c b/path.c
index 5d82503b6bd0a384b7918f2df497972f9492efa5..36972fd6df63b3c4eebdcf89238df8ade60d53c3 100644 (file)
--- a/path.c
+++ b/path.c
@@ -83,14 +83,19 @@ int git_mkstemp(char *path, size_t len, const char *template)
 }
 
 
-char *safe_strncpy(char *dest, const char *src, size_t n)
+size_t safe_strncpy(char *dest, const char *src, size_t size)
 {
-       strncpy(dest, src, n);
-       dest[n - 1] = '\0';
+       size_t ret = strlen(src);
 
-       return dest;
+       if (size) {
+               size_t len = (ret >= size) ? size - 1 : ret;
+               memcpy(dest, src, len);
+               dest[len] = '\0';
+       }
+       return ret;
 }
 
+
 int validate_symref(const char *path)
 {
        struct stat st;