Attachment 572331 Details for Bug 806413 – Proposed patch

[patch] Proposed patch

xorg-server-1.12.0.patch (text/plain), 1.60 KB, created by Denys Vlasenko on 2012-03-23 16:37:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2012-03-23 16:37:24 UTC

Size: 1.60 KB

patch

obsolete

>diff -urp xorg-server-1.12.0/include/opaque.h xorg-server-1.12.0.new/include/opaque.h
>--- xorg-server-1.12.0/include/opaque.h	2010-11-30 22:37:56.000000000 +0100
>+++ xorg-server-1.12.0.new/include/opaque.h	2012-03-23 17:19:37.029655396 +0100
>@@ -72,6 +72,7 @@ extern _X_EXPORT Bool whiteRoot;
> extern _X_EXPORT Bool bgNoneRoot;
> 
> extern _X_EXPORT Bool CoreDump;
>+extern _X_EXPORT int FatalSignal;
> 
> 
> #endif /* OPAQUE_H */
>diff -urp xorg-server-1.12.0/os/log.c xorg-server-1.12.0.new/os/log.c
>--- xorg-server-1.12.0/os/log.c	2012-01-17 00:51:54.000000000 +0100
>+++ xorg-server-1.12.0.new/os/log.c	2012-03-23 17:23:07.612949741 +0100
>@@ -481,7 +481,11 @@ AbortServer(void)
>     fflush(stderr);
>     if (CoreDump)
> 	OsAbort();
>-    exit (1);
>+    if (!FatalSignal)
>+        exit(1);
>+    signal(FatalSignal, SIG_DFL);
>+    raise(FatalSignal);
>+    exit(FatalSignal + 128);
> }
> 
> #define AUDIT_PREFIX "AUDIT: %s: %ld: "
>diff -urp xorg-server-1.12.0/os/osinit.c xorg-server-1.12.0.new/os/osinit.c
>--- xorg-server-1.12.0/os/osinit.c	2011-12-14 20:33:55.000000000 +0100
>+++ xorg-server-1.12.0.new/os/osinit.c	2012-03-23 17:21:30.966817117 +0100
>@@ -130,7 +130,7 @@ OsSigHandler(int signo)
> 
> #ifdef SA_SIGINFO
>   if (sip->si_code == SI_USER) {
>-      ErrorF("Recieved signal %d sent by process %ld, uid %ld\n",
>+      ErrorF("Received signal %d sent by process %ld, uid %ld\n",
> 	     signo, (long) sip->si_pid, (long) sip->si_uid);
>   } else {
>       switch (signo) {
>@@ -143,6 +143,7 @@ OsSigHandler(int signo)
>   }
> #endif
> 
>+  FatalSignal = signo;
>   FatalError("Caught signal %d (%s). Server aborting\n",
> 	     signo, strsignal(signo));
> }

Actions: View | Diff

Attachments on bug 806413: 572331