svn commit: trunk/busybox/networking

[landley at busybox.net]

Author: landley
Date: 2006-08-28 02:41:49 -0700 (Mon, 28 Aug 2006)
New Revision: 15998

Log:
Unbreak allbareconfig a bit.  (The telnetd.c fix is a perfect example of why
applets which are a forest of #ifdefs are unmaintainable.)


Modified:
   trunk/busybox/networking/inetd.c
   trunk/busybox/networking/telnetd.c


Changeset:
Modified: trunk/busybox/networking/inetd.c
===================================================================
--- trunk/busybox/networking/inetd.c	2006-08-28 06:52:43 UTC (rev 15997)
+++ trunk/busybox/networking/inetd.c	2006-08-28 09:41:49 UTC (rev 15998)
@@ -130,6 +130,7 @@
 
 #include "busybox.h"
 #include <syslog.h>
+#include <sys/un.h>
 
 //#define CONFIG_FEATURE_INETD_RPC
 //#define CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO

Modified: trunk/busybox/networking/telnetd.c
===================================================================
--- trunk/busybox/networking/telnetd.c	2006-08-28 06:52:43 UTC (rev 15997)
+++ trunk/busybox/networking/telnetd.c	2006-08-28 09:41:49 UTC (rev 15998)
@@ -24,28 +24,15 @@
 /*#define DEBUG 1 */
 #undef DEBUG
 
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <signal.h>
-#include <termios.h>
+#include "busybox.h"
+
 #ifdef DEBUG
 #define TELCMDS
 #define TELOPTS
 #endif
 #include <arpa/telnet.h>
-#include <ctype.h>
 #include <sys/syslog.h>
 
-#include "busybox.h"
 
 #define BUFSIZE 4000
 
@@ -443,7 +430,7 @@
 
 	/* Grab a TCP socket.  */
 
-	master_fd = bb_xsocket(SOCKET_TYPE, SOCK_STREAM, 0);
+	master_fd = xsocket(SOCKET_TYPE, SOCK_STREAM, 0);
 	(void)setsockopt(master_fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 
 	/* Set it to listen to specified port.  */
@@ -459,9 +446,9 @@
 	sa.sin_addr = bind_addr;
 #endif
 
-	bb_xbind(master_fd, (struct sockaddr *) &sa, sizeof(sa));
-	bb_xlisten(master_fd, 1);
-	bb_xdaemon(0, 0);
+	xbind(master_fd, (struct sockaddr *) &sa, sizeof(sa));
+	xlisten(master_fd, 1);
+	xdaemon(0, 0);
 
 	maxfd = master_fd;
 #endif /* CONFIG_FEATURE_TELNETD_INETD */