X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fwall-notify.c;h=e0d556db1386387e567bcb7967cb0fe9f1e213fb;hb=64d269e5e5984a1c252bfc67d7a84fb6e4b00f74;hp=b06740b39e143ddadc00b645685b82dec8f90dd4;hpb=aedd26b3895f80a440abdd0951eae627808ae8ed;p=wall-notify%2Fwall-notify.git

diff --git a/src/wall-notify.c b/src/wall-notify.c
index b06740b..e0d556d 100644
--- a/src/wall-notify.c
+++ b/src/wall-notify.c
@@ -1,7 +1,7 @@
 /*
  * Receive wall messages and pass them to a notification program via stdin.
  *
- * Copyright (C) 2014  Simon Ruderich
+ * Copyright (C) 2014-2015  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,8 +48,13 @@
 #endif
 
 
+static sig_atomic_t signaled = 0;
+
+
 static void sig_handler(int signal) {
     (void)signal;
+
+    signaled = 1;
 }
 static void setup_signals(void) {
     struct sigaction action;
@@ -164,11 +169,11 @@ static int set_utmpx(short type, int ptm) {
 static int login(int ptm) {
 #if defined(USE_UTEMPTER)
     int result = utempter_add_record(ptm, NULL);
-    /* Exit value of utempter_*() is not correct on all systems, e.g.
-     * FreeBSD() always returns 0. Checking the utmpx database manually is
-     * difficult because we don't know the exact values for ut_id and ut_line,
-     * therefore we only check the return value on systems known to return a
-     * useful value. */
+    /* Exit value of utempter_*() is not correct on all systems, e.g. FreeBSD
+     * always returns 0. Checking the utmpx database manually is difficult
+     * because we don't know the exact values for ut_id and ut_line, therefore
+     * we only check the return value on systems known to return a useful
+     * value. */
 # ifndef __linux
     result = 1;
 # endif
@@ -332,7 +337,7 @@ static void handle_wall(int fd, char **argv) {
     ssize_t r;
 
     assert(SSIZE_MAX <= SIZE_MAX);
-    while ((r = read(fd, buffer, sizeof(buffer))) > 0) {
+    while (!signaled && (r = read(fd, buffer, sizeof(buffer))) > 0) {
         size_t space;
         ssize_t r2;
 
@@ -425,7 +430,7 @@ int main(int argc, char **argv) {
                 printf("%s%s\n",
                        PACKAGE_STRING,
                        strlen(GIT_VERSION) ? " (Git " GIT_VERSION ")" : "");
-                exit(0);
+                exit(EXIT_SUCCESS);
                 break;
             default:
                 fprintf(stderr, "%s: unknown option '%s'!\n\n",