Merged with v3.8

diff --git a/build/sherlock.cfg b/build/sherlock.cfg
index b5b5683a4e4651940b453a1bcc6629d6b41ae9df..bb92a153cddee7482e8a01472fe66bd3db2b5de4 100644 (file)
--- a/build/sherlock.cfg
+++ b/build/sherlock.cfg
@@ -1,11 +1,11 @@
 # Configuration variables of Sherlock and their default values
-# (c) 2005 Martin Mares <mj@ucw.cz>
+# (c) 2005--2006 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("SHERLOCK_VERSION" => "3.8");
+Set("SHERLOCK_VERSION" => "3.9");
 
 # Installation directory for `make install'
-Set("INSTALL_DIR" => "~/run-3.8");
+Set("INSTALL_DIR" => "~/run-3.9");
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");

diff --git a/lib/sighandler.c b/lib/sighandler.c
index 9a76851423eaeaa5ad94c72e30ce1fab2988ee07..ca8269083afc44ebc7836ebc0c6f41e9acecaedc 100644 (file)
--- a/lib/sighandler.c
+++ b/lib/sighandler.c
@@ -26,21 +26,17 @@ signal_handler_internal(int sig)
 void
 handle_signal(int signum, struct sigaction *oldact)
 {
-#if 0
   struct sigaction act;
   bzero(&act, sizeof(act));
   act.sa_handler = signal_handler_internal;
   act.sa_flags = SA_NOMASK;
   if (sigaction(signum, &act, oldact) < 0)
     die("sigaction: %m");
-#endif
 }
 
 void
 unhandle_signal(int signum, struct sigaction *oldact)
 {
-#if 0
   if (sigaction(signum, oldact, NULL) < 0)
     die("sigaction: %m");
-#endif
 }