- patch from Denis Vlasenko to add and use bb_xsocket() and to use

  bb_xopen some more while at it.
  Also use shorter boilerplate while at it.

1 files changed, 2 insertions, 15 deletions

diff --git a/networking/nc.c b/networking/nc.c
index 85148c4a7..86f0b99df 100644
--- 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>
@@ -87,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");