summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2006-08-03 17:49:15 +0000
committerRob Landley2006-08-03 17:49:15 +0000
commit280a264fb893670f00e333dc75c58b6c77970048 (patch)
tree6f5f1902884646e7240bc12b149275095ec5e25d
parentd921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (diff)
downloadbusybox-280a264fb893670f00e333dc75c58b6c77970048.zip
busybox-280a264fb893670f00e333dc75c58b6c77970048.tar.gz
Attempt to fixup httpd.c to match svn 15767.
-rw-r--r--networking/httpd.c25
1 files changed, 6 insertions, 19 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 64d88f1..4e0ab92 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -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"
@@ -871,7 +858,7 @@ static int openServer(void)
lsocket.sin_family = AF_INET;
lsocket.sin_addr.s_addr = INADDR_ANY;
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 */
/* it may still be in a close down state. Allows bind to succeed. */
#ifdef SO_REUSEPORT
@@ -879,8 +866,8 @@ static int openServer(void)
#else
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)) ;
#endif
- bb_xbind(fd, (struct sockaddr *)&lsocket, sizeof(lsocket));
- listen(fd, 9); /* bb_xlisten? */
+ xbind(fd, (struct sockaddr *)&lsocket, sizeof(lsocket));
+ xlisten(fd, 9);
signal(SIGCHLD, SIG_IGN); /* prevent zombie (defunct) processes */
return fd;
}
@@ -1994,7 +1981,7 @@ int httpd_main(int argc, char *argv[])
#endif
#endif
- bb_xchdir(home_httpd);
+ xchdir(home_httpd);
#ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD
server = openServer();
# ifdef CONFIG_FEATURE_HTTPD_SETUID
@@ -2008,7 +1995,7 @@ int httpd_main(int argc, char *argv[])
{
char *p = getenv("PATH");
if(p) {
- p = bb_xstrdup(p);
+ p = xstrdup(p);
}
clearenv();
if(p)
@@ -2027,7 +2014,7 @@ int httpd_main(int argc, char *argv[])
#ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD
# if !DEBUG
- bb_xdaemon(1, 0); /* don`t change curent directory */
+ xdaemon(1, 0); /* don`t change curent directory */
# endif
return miniHttpd(server);
#else