projects
/
gapil.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correzioni ed esempio con inotify (ed epoll).
[gapil.git]
/
sources
/
wwwd.c
diff --git
a/sources/wwwd.c
b/sources/wwwd.c
index cb7752680ec47e59237c3e54b8c6fde06895f2fe..9524dd4b42be01e3cd2b8e8f1390b2390a3df1f1 100644
(file)
--- a/
sources/wwwd.c
+++ b/
sources/wwwd.c
@@
-74,6
+74,7
@@
int main(int argc, char *argv[])
int list_fd, conn_fd;
int compat = 0;
int reroot = 0;
int list_fd, conn_fd;
int compat = 0;
int reroot = 0;
+ int reuse = 1;
char * rootdir;
pid_t pid;
struct sockaddr_in cli_add;
char * rootdir;
pid_t pid;
struct sockaddr_in cli_add;
@@
-85,7
+86,7
@@
int main(int argc, char *argv[])
*/
int i;
opterr = 0; /* don't want writing to stderr */
*/
int i;
opterr = 0; /* don't want writing to stderr */
- while ( (i = getopt(argc, argv, "hdicr:")) != -1) {
+ while ( (i = getopt(argc, argv, "h
w
dicr:")) != -1) {
switch (i) {
/*
* Handling options
switch (i) {
/*
* Handling options
@@
-104,6
+105,9
@@
int main(int argc, char *argv[])
case 'd':
debugging = 1;
break;
case 'd':
debugging = 1;
break;
+ case 'w':
+ reuse = 0;
+ break;
case 'r':
reroot = 1;
rootdir = optarg;
case 'r':
reroot = 1;
rootdir = optarg;
@@
-129,7
+133,8
@@
int main(int argc, char *argv[])
SignalRestart(SIGCHLD, HandSigCHLD); /* restarting handler */
}
/* create and bind socket */
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 */
return 1;
}
/* chroot if requested */
@@
-214,7
+219,7
@@
void usage(void)
{
printf("Elementary echo server\n");
printf("Usage:\n");
{
printf("Elementary echo server\n");
printf("Usage:\n");
- printf("
echo
d [-h] \n");
+ printf("
www
d [-h] \n");
printf(" -h print this help\n");
printf(" -d write debug info\n");
printf(" -i use interactively\n");
printf(" -h print this help\n");
printf(" -d write debug info\n");
printf(" -i use interactively\n");