OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-submodule: wrap branch option with "<>" in usage strings.
[git-core/git.git]
/
path.c
diff --git
a/path.c
b/path.c
index
66acd24
..
cbbdf7d
100644
(file)
--- a/
path.c
+++ b/
path.c
@@
-48,7
+48,7
@@
char *mksnpath(char *buf, size_t n, const char *fmt, ...)
return cleanup_path(buf);
}
return cleanup_path(buf);
}
-static char *
git_
vsnpath(char *buf, size_t n, const char *fmt, va_list args)
+static char *vsnpath(char *buf, size_t n, const char *fmt, va_list args)
{
const char *git_dir = get_git_dir();
size_t len;
{
const char *git_dir = get_git_dir();
size_t len;
@@
-70,21
+70,22
@@
bad:
char *git_snpath(char *buf, size_t n, const char *fmt, ...)
{
char *git_snpath(char *buf, size_t n, const char *fmt, ...)
{
+ char *ret;
va_list args;
va_start(args, fmt);
va_list args;
va_start(args, fmt);
-
(void)git_
vsnpath(buf, n, fmt, args);
+
ret =
vsnpath(buf, n, fmt, args);
va_end(args);
va_end(args);
- return
buf
;
+ return
ret
;
}
char *git_pathdup(const char *fmt, ...)
{
}
char *git_pathdup(const char *fmt, ...)
{
- char path[PATH_MAX];
+ char path[PATH_MAX]
, *ret
;
va_list args;
va_start(args, fmt);
va_list args;
va_start(args, fmt);
-
(void)git_
vsnpath(path, sizeof(path), fmt, args);
+
ret =
vsnpath(path, sizeof(path), fmt, args);
va_end(args);
va_end(args);
- return xstrdup(
path
);
+ return xstrdup(
ret
);
}
char *mkpathdup(const char *fmt, ...)
}
char *mkpathdup(const char *fmt, ...)
@@
-118,23
+119,14
@@
char *mkpath(const char *fmt, ...)
char *git_path(const char *fmt, ...)
{
char *git_path(const char *fmt, ...)
{
- const char *git_dir = get_git_dir();
char *pathname = get_pathname();
va_list args;
char *pathname = get_pathname();
va_list args;
-
unsigned len
;
+
char *ret
;
- len = strlen(git_dir);
- if (len > PATH_MAX-100)
- return bad_path;
- memcpy(pathname, git_dir, len);
- if (len && git_dir[len-1] != '/')
- pathname[len++] = '/';
va_start(args, fmt);
va_start(args, fmt);
-
len += vsnprintf(pathname + len, PATH_MAX - len
, fmt, args);
+
ret = vsnpath(pathname, PATH_MAX
, fmt, args);
va_end(args);
va_end(args);
- if (len >= PATH_MAX)
- return bad_path;
- return cleanup_path(pathname);
+ return ret;
}
void home_config_paths(char **global, char **xdg, char *file)
}
void home_config_paths(char **global, char **xdg, char *file)