From: Steffen Prohaska <prohaska@zib.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Johannes Sixt <johannes.sixt@telecom.at>,
Peter Harris <git@peter.is-a-geek.org>,
Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 1/5] MinGW: Scan for \r in addition to \n when reading shbang lines
Date: Sat, 23 May 2009 10:04:47 +0200 [thread overview]
Message-ID: <1243065891-13270-2-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <1243065891-13270-1-git-send-email-prohaska@zib.de>
From: Peter Harris <git@peter.is-a-geek.org>
\r is common on Windows, so we should handle it gracefully.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
compat/mingw.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index cdeda1d..b723c4d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -525,8 +525,8 @@ static const char *parse_interpreter(const char *cmd)
if (buf[0] != '#' || buf[1] != '!')
return NULL;
buf[n] = '\0';
- p = strchr(buf, '\n');
- if (!p)
+ p = buf + strcspn(buf, "\r\n");
+ if (!*p)
return NULL;
*p = '\0';
--
1.6.3.1.54.g99dd
next prev parent reply other threads:[~2009-05-23 8:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-23 8:04 [PATCH 0/5] A few minor MinGW changes Steffen Prohaska
2009-05-23 8:04 ` Steffen Prohaska [this message]
2009-05-23 8:04 ` [PATCH 2/5] MinGW: the path separator to split GITPERLLIB is ';' on Win32 Steffen Prohaska
2009-05-23 8:04 ` [PATCH 3/5] MinGW: use POSIX signature of waitpid() Steffen Prohaska
2009-05-23 8:04 ` [PATCH 4/5] MinGW: Add a simple getpass() Steffen Prohaska
2009-05-23 8:04 ` [PATCH 5/5] MinGW: Fix compiler warning in merge-recursive Steffen Prohaska
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=1243065891-13270-2-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@peter.is-a-geek.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.sixt@telecom.at \
/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).