Make sure stdlib.h is always included before dmalloc.h to avoid problems

[oweals/busybox.git] / networking / telnet.c

diff --git a/networking/telnet.c b/networking/telnet.c
index ac6ec98ded4bf4b30dcb96f1bfb35d786ddf2eec..1b71bf26ab93867e5a89fcc5e64ee14b73bf75c0 100644 (file)
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -570,9 +570,8 @@ static void cookmode(void)
 
 extern int telnet_main(int argc, char** argv)
 {
-       char *host;
-       char *port;
        int len;
+       struct sockaddr_in s_in;
 #ifdef USE_POLL
        struct pollfd ufds[2];
 #else  
@@ -596,12 +595,13 @@ extern int telnet_main(int argc, char** argv)
        G.termios_raw = G.termios_def;
        cfmakeraw(&G.termios_raw);
        
-       if (argc < 2)   bb_show_usage();
-       port = (argc > 2)? argv[2] : "23";
+       if (argc < 2)
+               bb_show_usage();
        
-       host = argv[1];
+       bb_lookup_host(&s_in, argv[1]);
+       s_in.sin_port = bb_lookup_port((argc == 3) ? argv[2] : "telnet", "tcp", 23);
        
-       G.netfd = xconnect(host, port);
+       G.netfd = xconnect(&s_in);
 
        setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one);