Varie correzioni, completata revisione capitolo sull'I/O su file

[gapil.git] / listati / FifoReporter-init.c

diff --git a/listati/FifoReporter-init.c b/listati/FifoReporter-init.c
index e46342a45ab51eae123eafc778d1fc91d24fb2b8..dbcf4686c0f35e34f69f75667dd521441d94123a 100644 (file)
--- a/listati/FifoReporter-init.c
+++ b/listati/FifoReporter-init.c
@@ -1,16 +1,9 @@
 ...
-#include <sys/epoll.h>   /* Linux epoll interface */
-#include <sys/signalfd.h>/* Linux signalfd interface */
-
-/* Subroutines declaration */
-void usage(void);
-void die(char *);
-
-/* default name for the input fifo */
-char *fifoname = "/tmp/reporter.fifo";
+#include <sys/epoll.h>    /* Linux epoll interface */
+#include <sys/signalfd.h> /* Linux signalfd interface */
 
+void die(char *);         /* print error and exit function */
 #define MAX_EPOLL_EV 10
-
 int main(int argc, char *argv[])
 {
 /* Variables definition */
@@ -18,22 +11,23 @@ int main(int argc, char *argv[])
     char buffer[4096];
     int fifofd, epfd, sigfd;
     sigset_t sigmask;
+    char *fifoname = "/tmp/reporter.fifo";
     struct epoll_event epev, events[MAX_EPOLL_EV];
     struct signalfd_siginfo siginf;
     ...
     /* Initial setup */
-    if ((epfd=epoll_create(5)) < 0)                         // epoll init
+    if ((epfd=epoll_create(5)) < 0)                        // epoll init
        die("Failing on epoll_create");
     /* Signal setup for signalfd and epoll use */
     sigemptyset(&sigmask);
     sigaddset(&sigmask, SIGINT);
     sigaddset(&sigmask, SIGQUIT);
     sigaddset(&sigmask, SIGTERM);
-    if (sigprocmask(SIG_BLOCK, &sigmask, NULL) == -1)       // block signals
+    if (sigprocmask(SIG_BLOCK, &sigmask, NULL) == -1)      // block signals
        die("Failing in sigprocmask");
     if ((sigfd=signalfd(-1, &sigmask, SFD_NONBLOCK)) == -1) // take a signalfd
        die("Failing in signalfd");
-    epev.data.fd = sigfd;                                   // add fd to epoll 
+    epev.data.fd = sigfd;                      // add fd to epoll 
     epev.events = EPOLLIN;
     if (epoll_ctl(epfd, EPOLL_CTL_ADD, sigfd, &epev)) 
        die("Failing in signal epoll_ctl");
@@ -44,7 +38,7 @@ int main(int argc, char *argv[])
     }
     if ((fifofd = open(fifoname, O_RDWR|O_NONBLOCK)) < 0)  // open fifo
        die("Cannot open read only well known fifo");
-    epev.data.fd = fifofd;                 // add fifofd to epoll 
+    epev.data.fd = fifofd;                              // add fd to epoll 
     epev.events = EPOLLIN;
     if (epoll_ctl(epfd, EPOLL_CTL_ADD, fifofd, &epev)) 
        die("Failing in fifo epoll_ctl");