summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-17 17:08:36 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-17 17:08:36 -0700
commitfc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch)
tree59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /path.c
parentada5853c98c5c0ad84a990cc6ee7365a14555c0f (diff)
parentcd112cef999c59a7ca2a96c37b197d303a355924 (diff)
downloadgit-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.gz
Merge branch 'js/diff'
Diffstat (limited to 'path.c')
-rw-r--r--path.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/path.c b/path.c
index 5d82503b6b..36972fd6df 100644
--- 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;