mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-13 10:46:37 +02:00
Code

mingw: ensure sockets are initialized before calling gethostname 

If the Windows sockets subsystem has not been initialized yet then an
attempt to get the hostname returns an error and prints a warning to the
console. This solves this issue for msysGit as seen with 'git fetch'.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pat Thoyts 2011-10-15 15:05:20 +01:00 committed by Junio C Hamano
parent 8850c3da95
commit 13d24b018f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compat/mingw.c
View File

@ -1321,6 +1321,13 @@ static void ensure_socket_initialization(void)
initialized = 1;
}
#undef gethostname
int mingw_gethostname(char *name, int namelen)
{
ensure_socket_initialization();
return gethostname(name, namelen);
}
#undef gethostbyname
struct hostent *mingw_gethostbyname(const char *host)
{

3
compat/mingw.h
View File

@ -190,6 +190,9 @@ char *mingw_getcwd(char *pointer, int len);
char *mingw_getenv(const char *name);
#define getenv mingw_getenv
int mingw_gethostname(char *host, int namelen);
#define gethostname mingw_gethostname
struct hostent *mingw_gethostbyname(const char *host);
#define gethostbyname mingw_gethostbyname