X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2FFortuneServer.c;h=4cb65cac20e3fea98cff688b0b0e5e9ab0f3ce86;hp=5f10062960b8dfddfa5daee88c06add0f5fa7d7d;hb=fa15a3f1ecd64efd8440e46d398fd9976abc3d25;hpb=6c8d59152cff88b5835eeb749445148bb3546a5b

diff --git a/sources/FortuneServer.c b/sources/FortuneServer.c
index 5f10062..4cb65ca 100644
--- a/sources/FortuneServer.c
+++ b/sources/FortuneServer.c
@@ -26,25 +26,26 @@
  *
  * Usage: fortuned -h give all info
  *
- * $Id: FortuneServer.c,v 1.3 2002/08/18 23:24:44 piccardi Exp $
- *
  ****************************************************************/
 /* 
  * Include needed headers
  */
-#include <sys/types.h>   /* predefined types */
-#include <sys/stat.h>    /*  */
-#include <unistd.h>      /* include unix standard library */
-#include <stdio.h>       /* include standard I/O library */
-#include <stdlib.h>	 /* standard library */
-#include <string.h>	 /* ANSI C standard string */
-#include <errno.h>	 /* errorstring */
-#include <fcntl.h>	 /*  */
+#include <sys/types.h>   /* primitive system data types */
+#include <sys/stat.h>    /* file characteristics constants and functions */
+#include <unistd.h>      /* unix standard library */
+#include <stdio.h>       /* standard I/O library */
+#include <stdlib.h>	 /* C standard library */
+#include <string.h>	 /* C strings library */
+#include <errno.h>	 /* error definitions and routines */
+#include <signal.h>	 /* signal constants, types and functions */
+#include <fcntl.h>	 /* file control functions */
 
 #include "macros.h"
+#include "Gapil.h"
 
 /* Subroutines declaration */
 void usage(void);
+void HandSIGTERM(int signo);
 int FortuneParse(char *file, char **fortune, int n);
 
 /* name of well known fifo */
@@ -53,7 +54,7 @@ int main(int argc, char *argv[])
 {
 /* Variables definition */
     int i, n = 0;
-    char *fortunefilename = "/usr/share/games/fortunes/kids";
+    char *fortunefilename = "/usr/share/games/fortunes/linux";
     char **fortune;
     char line[80];
     int fifo_server, fifo_client;
@@ -94,39 +95,54 @@ int main(int argc, char *argv[])
      *		      Main code beginning
      * 
      * ***********************************************************/
-    Signal(SIGTERM, HandSIGTERM);
+    if (n==0) usage();          /* if no pool depth exit printing usage info */
+    Signal(SIGTERM, HandSIGTERM);            /* set handlers for termination */
     Signal(SIGINT, HandSIGTERM);
     Signal(SIGQUIT, HandSIGTERM);
-    if (n==0) usage();          /* if no pool depth exit printing usage info */
     i = FortuneParse(fortunefilename, fortune, n);          /* parse phrases */
-    for (n=0; n<i; n++) debug("%s\n\n", fortune[n]);
+    for (n=0; n<i; n++) debug("%s%%\n", fortune[n]);
     /* 
      * Comunication section 
      */
     if (mkfifo(fifoname, 0622)) {  /* create well known fifo if does't exist */
 	if (errno!=EEXIST) {
 	    perror("Cannot create well known fifo");
-	    exit(-1);
+	    exit(1);
 	}
     }
+    daemon(0, 0);
+    /* open fifo two times to avoid EOF */
+    fifo_server = open(fifoname, O_RDONLY);
+    if (fifo_server < 0) {
+	perror("Cannot open read only well known fifo");
+	exit(1);
+    }
+    if (open(fifoname, O_WRONLY) < 0) {
+	perror("Cannot open write only well known fifo");
+	exit(1);
+    }
     /* Main body: loop over requests */
     while (1) {
-	fifo_server = open(fifoname, O_RDONLY);      /* open well known fifo */
-	if (fifo_server < 0) {
-	    perror("Cannot open well known fifo");
-	    exit(-1);
-	}
 	nread = read(fifo_server, line, 79);                 /* read request */
-	line[nread] = 0;
+	if (nread < 0) {
+	    perror("Read Error");
+	    exit(1);
+	}
+	line[nread] = 0;                       /* terminate fifo name string */
 	debug("%s %d\n", line,nread);
 	n = random() % i;                             /* select random value */
 	debug("fortune[%d]=%s\n", n, fortune[n]);
 	fifo_client = open(line, O_WRONLY);              /* open client fifo */
+	if (fifo_client < 0) {
+	    debug("Client fifo is %s\n", line);
+	    perror("Cannot open");
+	    exit(1);
+	}
 	nread = write(fifo_client,                           /* write phrase */
 		      fortune[n], strlen(fortune[n])+1);
-	close(fifo_client);                         /* close well known fifo */
-	close(fifo_server);                             /* close client fifo */
+	close(fifo_client);                             /* close client fifo */
     }
+    debug("Exiting for unknown reasons\n");
 }
 /*
  * routine to print usage info and exit
@@ -144,6 +160,7 @@ void usage(void) {
  * Signal Handler to manage termination
  */
 void HandSIGTERM(int signo) {
+    debug("Terminated by %s\n", strsignal(signo));
     unlink(fifoname);
     exit(0);
 }