Remove code for protocols we don't properly support. (Most of this could

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

diff --git a/networking/nc.c b/networking/nc.c
index 8f641ae4f9513d01b2c5f73bc4faa13004b8413d..57b0917442d2513ffbd25f844a15fef94673fa5a 100644 (file)
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -10,19 +10,7 @@
     19990512 Uses Select. Charles P. Wright
     19990513 Fixes stdin stupidity and uses buffers.  Charles P. Wright
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
 #include <stdio.h>
@@ -48,7 +36,9 @@ static void timeout(int signum)
 int nc_main(int argc, char **argv)
 {
        int do_listen = 0, lport = 0, delay = 0, wsecs = 0, tmpfd, opt, sfd, x;
-       char buf[BUFSIZ];
+
+#define buf bb_common_bufsiz1
+
 #ifdef CONFIG_NC_GAPING_SECURITY_HOLE
        char *pr00gie = NULL;
 #endif
@@ -85,8 +75,7 @@ int nc_main(int argc, char **argv)
        if ((do_listen && optind != argc) || (!do_listen && optind + 2 != argc))
                bb_show_usage();
 
-       if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-               bb_perror_msg_and_die("socket");
+       sfd = bb_xsocket(AF_INET, SOCK_STREAM, 0);
        x = 1;
        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x)) == -1)
                bb_perror_msg_and_die("reuseaddr");
@@ -101,16 +90,13 @@ int nc_main(int argc, char **argv)
                memset(&address.sin_addr, 0, sizeof(address.sin_addr));
                address.sin_port = lport;
 
-               if (bind(sfd, (struct sockaddr *) &address, sizeof(address)) < 0)
-                       bb_perror_msg_and_die("bind");
+               bb_xbind(sfd, (struct sockaddr *) &address, sizeof(address));
        }
 
        if (do_listen) {
                socklen_t addrlen = sizeof(address);
 
-               if (listen(sfd, 1) < 0)
-                       bb_perror_msg_and_die("listen");
-
+               bb_xlisten(sfd, 1);
                if ((tmpfd = accept(sfd, (struct sockaddr *) &address, &addrlen)) < 0)
                        bb_perror_msg_and_die("accept");