From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 14 Dec 2010 20:38:37 GMT
Subject: Re: [PATCH 08/14] help.c: Fix detection of custom merge strategy on cygwin
Message-ID: <201012142138.37679.j6t@kdbg.org>
In-Reply-To: <4D07B786.2060602@ramsay1.demon.co.uk>

On Dienstag, 14. Dezember 2010, Ramsay Jones wrote:
> @@ -126,7 +126,10 @@ static int is_executable(const char *name)
>  	    !S_ISREG(st.st_mode))
>  		return 0;
>
> -#ifdef WIN32
> +#if defined(WIN32) || defined(__CYGWIN__)
> +#if defined(__CYGWIN__)
> +if ((st.st_mode & S_IXUSR) == 0)
> +#endif
>  {	/* cannot trust the executable bit, peek into the file instead */
>  	char buf[3] = { 0 };
>  	int n;

Do you gain a lot by this extra condition? Wouldn't

-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)

be sufficient?

-- Hannes