Changeset 5723 for lm-sensors/trunk/prog/sensord/sensord.c

Timestamp:

05/13/09 18:11:57 (4 years ago)

Author:

andy

Message:

Replace the deprecated signal() function by sigaction().

Files:

• lm-sensors/trunk/prog/sensord/sensord.c (modified) (3 diffs)

lm-sensors/trunk/prog/sensord/sensord.c

@@ -66 +66 @@
 static void signalHandler(int sig)
 {
-        signal(sig, signalHandler);
         switch (sig) {
         case SIGTERM:
@@ -148 +147 @@
 }
 
+static void install_sighandler(void)
+{
+        struct sigaction new;
+        int ret;
+
+        memset(&new, 0, sizeof(struct sigaction));
+        new.sa_handler = signalHandler;
+        sigemptyset(&new.sa_mask);
+        new.sa_flags = SA_RESTART;
+
+        ret = sigaction(SIGTERM, &new, NULL);
+        if (ret == -1) {
+                fprintf(stderr, "Could not set sighandler for SIGTERM: %s\n",
+                        strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+
+        ret = sigaction(SIGHUP, &new, NULL);
+        if (ret == -1) {
+                fprintf(stderr, "Could not set sighandler for SIGHUP: %s\n",
+                        strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+}
+
 static void daemonize(void)
 {
@@ -173 +197 @@
         }
 
-        /* I should use sigaction but... */
-        if (signal(SIGTERM, signalHandler) == SIG_ERR ||
-            signal (SIGHUP, signalHandler) == SIG_ERR) {
-                perror("signal");
-                exit(EXIT_FAILURE);
-        }
+        install_sighandler();
 
         if ((pid = fork()) == -1) {