Sync OpenBSD patchset 225:

If there is an error in the configuration file, don't just exit(1) as this can
cause the client to hang. Instead, send the error message, then mark the client
as bad and start a normal shutdown so the server exits once the error is
written.

This also allows some code duplicating daemon(3) to be trimmed and logging to
begin earlier.

Prompted by Theo noticing the behaviour on error wasn't documented.
This commit is contained in:
Tiago Cunha
2009-08-09 17:19:18 +00:00
parent 602aae7839
commit 5b56ea1816
4 changed files with 57 additions and 43 deletions

3
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.404 2009-08-09 16:57:49 tcunha Exp $ */
/* $Id: tmux.h,v 1.405 2009-08-09 17:19:18 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -899,6 +899,7 @@ struct client {
#define CLIENT_STATUS 0x10
#define CLIENT_REPEAT 0x20 /* allow command to repeat within repeat time */
#define CLIENT_SUSPENDED 0x40
#define CLIENT_BAD 0x80
int flags;
char *message_string;