mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
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:
parent
8850c3da95
commit
13d24b018f
|
@ -1321,6 +1321,13 @@ static void ensure_socket_initialization(void)
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#undef gethostname
|
||||||
|
int mingw_gethostname(char *name, int namelen)
|
||||||
|
{
|
||||||
|
ensure_socket_initialization();
|
||||||
|
return gethostname(name, namelen);
|
||||||
|
}
|
||||||
|
|
||||||
#undef gethostbyname
|
#undef gethostbyname
|
||||||
struct hostent *mingw_gethostbyname(const char *host)
|
struct hostent *mingw_gethostbyname(const char *host)
|
||||||
{
|
{
|
||||||
|
|
|
@ -190,6 +190,9 @@ char *mingw_getcwd(char *pointer, int len);
|
||||||
char *mingw_getenv(const char *name);
|
char *mingw_getenv(const char *name);
|
||||||
#define getenv mingw_getenv
|
#define getenv mingw_getenv
|
||||||
|
|
||||||
|
int mingw_gethostname(char *host, int namelen);
|
||||||
|
#define gethostname mingw_gethostname
|
||||||
|
|
||||||
struct hostent *mingw_gethostbyname(const char *host);
|
struct hostent *mingw_gethostbyname(const char *host);
|
||||||
#define gethostbyname mingw_gethostbyname
|
#define gethostbyname mingw_gethostbyname
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue