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

[gapil.git] / sources / wwwd.c

diff --git a/sources/wwwd.c b/sources/wwwd.c
index cb7752680ec47e59237c3e54b8c6fde06895f2fe..0b6dfde9a9be2ca3e0ba4d2dcf04ee149e530083 100644 (file)
--- a/sources/wwwd.c
+++ b/sources/wwwd.c
@@ -26,33 +26,34 @@
  *
  * Usage: wwwd -h give all info
  *
- * $Id$ 
- *
  ****************************************************************/
 /* 
  * Include needed headers
  */
 #define _GNU_SOURCE
-#include <string.h>      /* error strings */
-#include <sys/types.h>   /* predefined types */
-#include <unistd.h>      /* include unix standard library */
-#include <arpa/inet.h>   /* IP addresses conversion utiliites */
-#include <sys/socket.h>  /* socket library */
-#include <stdio.h>      /* include standard I/O library */
-#include <time.h>
+#include <sys/types.h>   /* primitive system data types */
+#include <sys/stat.h>    /* file characteristics constants and functions */
+#include <stdlib.h>      /* C standard library */
+#include <stdio.h>      /* standard I/O library */
+#include <unistd.h>      /* unix standard library */
+#include <arpa/inet.h>   /* IP addresses conversion utilities */
+#include <sys/socket.h>  /* socket constants, types and functions */
+#include <time.h>        /* date and time constants, types and functions */
 #include <syslog.h>      /* syslog system functions */
-#include <signal.h>      /* signal functions */
-#include <errno.h>       /* error code */
-#include <stdlib.h>
+#include <signal.h>      /* signal constants, types and functions */
+#include <errno.h>       /* error definitions and routines */
+#include <string.h>      /* C strings library */
+#include <dirent.h>      /* directory operation constants and functions */
 
 #include "Gapil.h"
 
+/* 
+ * Function and globals definitions
+ */
 #define BACKLOG 10
 #define MAXLINE 256
 int demonize  = 1;  /* daemon use option: default is daemon */
 int debugging = 0;  /* debug info printing option: default is no debug */
-
-/* Subroutines declaration */
 struct code_page {
     char * code; 
     char * name;
@@ -65,15 +66,17 @@ void PrintErr(char * error);
 void print_headers(FILE *file, struct code_page code);
 void print_error(FILE *file, struct code_page page, char * string);
 
-/* Program beginning */
-int main(int argc, char *argv[])
+/*
+ * Main program
+ */int main(int argc, char *argv[])
 {
-/* 
- * Variables definition  
- */
+    /* 
+     * Variables definition  
+     */
     int list_fd, conn_fd;
     int compat = 0;
     int reroot = 0;
+    int reuse = 1;
     char * rootdir;
     pid_t pid;
     struct sockaddr_in cli_add;
@@ -85,7 +88,7 @@ int main(int argc, char *argv[])
      */
     int i;
     opterr = 0;         /* don't want writing to stderr */
-    while ( (i = getopt(argc, argv, "hdicr:")) != -1) {
+    while ( (i = getopt(argc, argv, "hwdicr:")) != -1) {
        switch (i) {
        /* 
         * Handling options 
@@ -104,6 +107,9 @@ int main(int argc, char *argv[])
        case 'd':
            debugging = 1;
            break;
+       case 'w':
+           reuse = 0;
+           break;
        case 'r':
            reroot = 1;
            rootdir = optarg;
@@ -129,7 +135,8 @@ int main(int argc, char *argv[])
        SignalRestart(SIGCHLD, HandSigCHLD);  /* restarting handler */
     }
     /* create and bind socket */
-    if ( (list_fd = sockbind2(argv[optind], "www", 6, SOCK_STREAM)) < 0) {
+    if ( (list_fd = sockbindopt(argv[optind], "www", 6, 
+                               SOCK_STREAM, reuse)) < 0) {
        return 1;
     }   
     /* chroot if requested */
@@ -214,7 +221,7 @@ void usage(void)
 {
     printf("Elementary echo server\n");
     printf("Usage:\n");
-    printf("  echod [-h] \n");
+    printf("  wwwd [-h] \n");
     printf("  -h          print this help\n");
     printf("  -d          write debug info\n");
     printf("  -i          use interactively\n");