[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.1-52-g76526e2

[Enrico Zini]

The following commit has been merged in the master branch:
commit 0398daf1a16974c84540850d98218b052b339abe
Author: Enrico Zini <enrico at enricozini.org>
Date:   Fri Feb 20 13:39:38 2009 +0000

    unblock signals while waiting for retry time

diff --git a/TODO b/TODO
index 3eaf57c..c6caefc 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@
  + configure via preseeding
  + path is not good for root
  + split X options before passing them to xinit?  Is it needed or xinit does it?
- - don't block ^C and ^\ if run interactively
+ + signals are blocked while waiting between retries
  - set up the right environment, and cd to the right place
 
 Preseed values for testing:
diff --git a/nodm.c b/nodm.c
index 3289af4..aa33b65 100644
--- a/nodm.c
+++ b/nodm.c
@@ -282,6 +282,13 @@ static int run_shell (int* status)
 		}
 	} while (WIFSTOPPED (*status));
 
+	/* Unblock signals */
+	sigfillset (&ourset);
+	if (sigprocmask (SIG_UNBLOCK, &ourset, NULL)) {
+		(void) fprintf (stderr, "%s: signal malfunction\n", Prog);
+		goto killed;
+	}
+
 	if (caught)
 		goto killed;
 

-- 
Automatic Display Manager