Attachment 646454 Details for Bug 877497 – Proposed patch

[patch] Proposed patch

xfce-utils-4.4.3-xflock4-restart_on_sigv.patch (text/plain), 1.19 KB, created by Denys Vlasenko on 2012-11-16 17:06:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2012-11-16 17:06:56 UTC

Size: 1.19 KB

patch

obsolete

>diff -uprN xfce-utils-4.8.3.orig/scripts/xflock4 xfce-utils-4.8.3/scripts/xflock4
>--- xfce-utils-4.8.3.orig/scripts/xflock4	2011-09-22 21:38:05.000000000 +0200
>+++ xfce-utils-4.8.3/scripts/xflock4	2012-11-16 17:58:49.935513889 +0100
>@@ -20,12 +20,26 @@
> #
> 
> if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
>-    xscreensaver-command -lock 
>+    xscreensaver-command -lock
> elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
>     gnome-screensaver-command --lock
> elif test x"`which slock 2>/dev/null`" != x""; then
>-   slock
>+    slock
> else
>-    xlock $*
>+    # xlock from xlockmore package has many plugins.
>+    # No chance all of them will ever be thoroughly debugged.
>+    # Segfaults are observed to make it exit and unlock the screen.
>+    # Pathetic...
>+    while true; do
>+        xlock "$@"
>+        r=$?
>+        test $r -le 128 && exit $r
>+        # exitcode >128: died on signal! Not good.
>+        sig=$((r-128))
>+        test $sig -eq 15 && exit $r # TERM is ok
>+        test $sig -eq 9 && exit $r  # KILL is ok
>+        logger "xlock died on signal $sig (`kill -l $sig`). Please report it to the xlock maintainer."
>+        # Rinse, repeat.
>+    done
> fi
> exit 0

Actions: View | Diff

Attachments on bug 877497: 646454