From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Git <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
msysGit <msysgit@googlegroups.com>,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: [PATCH 8/8] mingw: ensure sockets are initialized before calling gethostname
Date: Fri, 14 Oct 2011 23:53:35 +0100 [thread overview]
Message-ID: <1318632815-29945-9-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1318632815-29945-1-git-send-email-patthoyts@users.sourceforge.net>
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>
---
compat/mingw.c | 7 +++++++
compat/mingw.h | 3 +++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 8947418..efdc703 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -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)
{
diff --git a/compat/mingw.h b/compat/mingw.h
index ce9dd98..fecf0d0 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -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
--
1.7.7.1.gbba15
prev parent reply other threads:[~2011-10-14 22:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 22:53 [PATCH 0/8] Some patches from msysGit Pat Thoyts
2011-10-14 22:53 ` [PATCH 1/8] t1020: disable the pwd test on MinGW Pat Thoyts
2011-10-14 22:53 ` [PATCH 2/8] t1402: Ignore a few cases that must fail due to DOS path expansion Pat Thoyts
2011-10-15 5:36 ` Junio C Hamano
2011-10-15 13:49 ` Pat Thoyts
2011-10-15 20:15 ` Junio C Hamano
2011-10-14 22:53 ` [PATCH 3/8] t9001: do not fail only due to CR/LF issues Pat Thoyts
2011-10-14 22:53 ` [PATCH 4/8] git-svn: On MSYS, escape and quote SVN_SSH also if set by the user Pat Thoyts
2011-10-14 22:53 ` [PATCH 5/8] t9901: fix line-ending dependency on windows Pat Thoyts
2011-10-15 5:44 ` Junio C Hamano
2011-10-15 12:25 ` Pat Thoyts
2011-10-14 22:53 ` [PATCH 6/8] t9300: do not run --cat-blob-fd related tests on MinGW Pat Thoyts
2011-10-14 22:53 ` [PATCH 7/8] mergetools: use the correct tool for Beyond Compare 3 on Windows Pat Thoyts
2011-10-15 5:50 ` Junio C Hamano
2011-10-15 10:27 ` Sebastian Schuberth
2011-10-15 12:39 ` Pat Thoyts
2011-10-16 10:12 ` Sebastian Schuberth
2011-10-16 10:21 ` Sebastian Schuberth
2011-10-15 20:14 ` Junio C Hamano
2011-10-16 10:11 ` Sebastian Schuberth
2011-10-14 22:53 ` Pat Thoyts [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318632815-29945-9-git-send-email-patthoyts@users.sourceforge.net \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).