fix race condition in handle_wall()

[wall-notify/wall-notify.git] / src / wall-notify.c

diff --git a/src/wall-notify.c b/src/wall-notify.c
index b06740b39e143ddadc00b645685b82dec8f90dd4..efe500513f760cff017b631486c6cabfbf6094c2 100644 (file)
--- a/src/wall-notify.c
+++ b/src/wall-notify.c
@@ -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;
@@ -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",