global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-18 13:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a Windows-specific fallback to getenv("HOME");

Browse Source 
This fixes msysGit issue 482 properly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2010-06-02 00:41:33 +02:00
parent 8754a4c94c
commit 44b53aba25
6 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/config.c
View File

@@ -169,7 +169,7 @@ static int get_value(const char *key_, const char *regex_)
local = given_config_file;
if (!local) {
const char *home = getenv("HOME");
const char *home = get_home_directory();
local = repo_config = git_pathdup("config");
if (home)
global = xstrdup(mkpath("%s/.gitconfig", home));
@@ -379,7 +379,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
}
if (use_global_config) {
char *home = getenv("HOME");
const char *home = get_home_directory();
if (home) {
char *user_config = xstrdup(mkpath("%s/.gitconfig", home));
given_config_file = user_config;

18
compat/mingw.c
View File

@@ -1831,3 +1831,21 @@ pid_t waitpid(pid_t pid, int *status, int options)
errno = EINVAL;
return -1;
}
const char *get_windows_home_directory(void)
{
static const char *home_directory = NULL;
struct strbuf buf = STRBUF_INIT;
if (home_directory)
return home_directory;
home_directory = getenv("HOME");
if (home_directory && *home_directory)
return home_directory;
strbuf_addf(&buf, "%s/%s", getenv("HOMEDRIVE"), getenv("HOMEPATH"));
home_directory = strbuf_detach(&buf, NULL);
return home_directory;
}

3
compat/mingw.h
View File

@@ -350,3 +350,6 @@ static int mingw_main(c,v)
* Used by Pthread API implementation for Windows
*/
extern int err_win_to_posix(DWORD winerr);
extern const char *get_windows_home_directory();
#define get_home_directory() get_windows_home_directory()

2
config.c
View File

@@ -946,7 +946,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
found += 1;
}
home = getenv("HOME");
home = get_home_directory();
if (home) {
char buf[PATH_MAX];
char *user_config = mksnpath(buf, sizeof(buf), "%s/.gitconfig", home);

4
git-compat-util.h
View File

@@ -602,4 +602,8 @@ struct passwd *xgetpwuid_self(void);
#define mark_as_git_dir(x) /* noop */
#endif
#ifndef get_home_directory
#define get_home_directory() getenv("HOME")
#endif
#endif

2
path.c
View File

@@ -240,7 +240,7 @@ char *expand_user_path(const char *path)
const char *username = path + 1;
size_t username_len = first_slash - username;
if (username_len == 0) {
const char *home = getenv("HOME");
const char *home = get_home_directory();
if (!home)
goto return_null;
strbuf_add(&user_path, home, strlen(home));