Erik Faye-Lund <kusmabite@gmail.com> writes:

quoted text
> On Thu, Oct 14, 2010 at 12:47 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Erik Faye-Lund <kusmabite@gmail.com> writes:
>> ...
>>> @@ -1017,7 +1005,12 @@ int main(int argc, char **argv)
>>> +             if (inetd_mode && !freopen("/dev/null", "w", stderr))
>>>                       die_errno("failed to redirect stderr to /dev/null");
>>
>> This is not particularly a good style.  Please make it more clear that we
>> freopen in inetd mode by writing it like this:
>>
>>        if (inetd_mode) {
>>                if (!freopen(...))
>>                        die_errno(...)
>>        }
>>
>>
>
> Much nicer, yeah. Now I'm tempted to do this also:
> ...

Yeah, that is much much saner.  Thanks.

quoted text
> ---8<---
> diff --git a/daemon.c b/daemon.c
> index 7f5d72f..11a5e06 100644
> --- a/daemon.c
> +++ b/daemon.c
> @@ -1010,7 +1010,6 @@ int main(int argc, char **argv)
>  			continue;
>  		}
>  		if (!strcmp(arg, "--inetd")) {
> -			serve_mode = 1;
>  			inetd_mode = 1;
>  			log_syslog = 1;
>  			continue;
> @@ -1159,7 +1158,7 @@ int main(int argc, char **argv)
>  			die_errno("failed to redirect stderr to /dev/null");
>  	}
>
> -	if (serve_mode) {
> +	if (inetd_mode || serve_mode) {
>  		struct sockaddr_storage ss;
>  		struct sockaddr *peer = (struct sockaddr *)&ss;
>  		socklen_t slen = sizeof(ss);
> ---8<---
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html