[PATCH] Lift fatal signal handlers from DDX'es up to a common DIX implementation

[Peter Hutterer]

On Tue, Mar 31, 2009 at 11:23:26AM -0700, Alan Coopersmith wrote:
> Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
> ---
>  hw/kdrive/src/kdrive.c         |   34 ++--------------
>  hw/xfree86/common/xf86Events.c |   28 +++----------
>  hw/xfree86/common/xf86Init.c   |   18 +++++----
>  hw/xfree86/common/xf86Priv.h   |    2 +-
>  include/os.h                   |    2 +
>  os/log.c                       |    7 +++
>  os/osinit.c                    |   83 ++++++++++++++++++++++++++++++++++++++++
>  7 files changed, 113 insertions(+), 61 deletions(-)

[...]
 
> diff --git a/os/log.c b/os/log.c
> index b01965a..3961b0b 100644
> --- a/os/log.c
> +++ b/os/log.c
> @@ -98,6 +98,10 @@ OR PERFORMANCE OF THIS SOFTWARE.
>  #define getpid(x) _getpid(x)
>  #endif
>  
> +#ifdef XF86BIGFONT
> +#define _XF86BIGFONT_SERVER_
> +#include <X11/extensions/xf86bigfont.h>
> +#endif
>  
>  #ifdef DDXOSVERRORF
>  void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;
> @@ -401,6 +405,9 @@ void AbortServer(void) __attribute__((noreturn));
>  void
>  AbortServer(void)
>  {
> +#ifdef XF86BIGFONT
> +    XF86BigfontCleanup();
> +#endif

>      CloseWellKnownConnections();
>      OsCleanup(TRUE);
>      CloseDownDevices();

Not sure about this hunk. I thought the "rule" is that no XF86 code should be
in the dix. Can these three lines be moved into the xf86SigHandler?

Cheers,
  Peter