[PATCH 1/5] MinGW: Scan for \r in addition to \n when reading shbang lines

From

Steffen Prohaska <prohaska@zib.de>

Date

May 23, 2009, 08:04 UTC

Message-ID

<1243065891-13270-2-git-send-email-prohaska@zib.de>

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