emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fixup httpd.c to match svn 15767.

Browse Source
This commit is contained in:
Rob Landley 2006-08-03 17:49:15 +00:00
parent d921b2ecc0
commit 280a264fb8
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
networking/httpd.c
View File

@ -89,19 +89,6 @@
*/ */
#include <stdio.h>
#include <ctype.h> /* for isspace */
#include <string.h>
#include <stdlib.h> /* for malloc */
#include <time.h>
#include <unistd.h> /* for close */
#include <signal.h>
#include <sys/types.h>
#include <sys/socket.h> /* for connect and socket*/
#include <netinet/in.h> /* for sockaddr_in */
#include <sys/stat.h>
#include <sys/wait.h>
#include <fcntl.h> /* for open modes */
#include "busybox.h" #include "busybox.h"
@ -871,7 +858,7 @@ static int openServer(void)
lsocket.sin_family = AF_INET; lsocket.sin_family = AF_INET;
lsocket.sin_addr.s_addr = INADDR_ANY; lsocket.sin_addr.s_addr = INADDR_ANY;
lsocket.sin_port = htons(config->port); lsocket.sin_port = htons(config->port);
fd = bb_xsocket(AF_INET, SOCK_STREAM, 0); fd = xsocket(AF_INET, SOCK_STREAM, 0);
/* tell the OS it's OK to reuse a previous address even though */ /* tell the OS it's OK to reuse a previous address even though */
/* it may still be in a close down state. Allows bind to succeed. */ /* it may still be in a close down state. Allows bind to succeed. */
#ifdef SO_REUSEPORT #ifdef SO_REUSEPORT
@ -879,8 +866,8 @@ static int openServer(void)
#else #else
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)) ; setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)) ;
#endif #endif
bb_xbind(fd, (struct sockaddr *)&lsocket, sizeof(lsocket)); xbind(fd, (struct sockaddr *)&lsocket, sizeof(lsocket));
listen(fd, 9); /* bb_xlisten? */ xlisten(fd, 9);
signal(SIGCHLD, SIG_IGN); /* prevent zombie (defunct) processes */ signal(SIGCHLD, SIG_IGN); /* prevent zombie (defunct) processes */
return fd; return fd;
} }
@ -1994,7 +1981,7 @@ int httpd_main(int argc, char *argv[])
#endif #endif
#endif #endif
bb_xchdir(home_httpd); xchdir(home_httpd);
#ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD #ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD
server = openServer(); server = openServer();
# ifdef CONFIG_FEATURE_HTTPD_SETUID # ifdef CONFIG_FEATURE_HTTPD_SETUID
@ -2008,7 +1995,7 @@ int httpd_main(int argc, char *argv[])
{ {
char *p = getenv("PATH"); char *p = getenv("PATH");
if(p) { if(p) {
p = bb_xstrdup(p); p = xstrdup(p);
} }
clearenv(); clearenv();
if(p) if(p)
@ -2027,7 +2014,7 @@ int httpd_main(int argc, char *argv[])
#ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD #ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD
# if !DEBUG # if !DEBUG
bb_xdaemon(1, 0); /* don`t change curent directory */ xdaemon(1, 0); /* don`t change curent directory */
# endif # endif
return miniHttpd(server); return miniHttpd(server);
#else #else