diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-12 17:55:51 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-12 17:55:51 +0000 |
| commit | dac7ff15b7d32deeeef3d9665744fc5774c21d70 (patch) | |
| tree | 0e4c34863628d79fdad0c6217f4deb0ca0a91c33 /networking/nc.c | |
| parent | 79865bc5077cf6d17b27e9599921d4c85b1575fd (diff) | |
| download | busybox-w32-dac7ff15b7d32deeeef3d9665744fc5774c21d70.tar.gz busybox-w32-dac7ff15b7d32deeeef3d9665744fc5774c21d70.tar.bz2 busybox-w32-dac7ff15b7d32deeeef3d9665744fc5774c21d70.zip | |
- 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.
Diffstat (limited to 'networking/nc.c')
| -rw-r--r-- | networking/nc.c | 17 |
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 @@ | |||
| 10 | 19990512 Uses Select. Charles P. Wright | 10 | 19990512 Uses Select. Charles P. Wright |
| 11 | 19990513 Fixes stdin stupidity and uses buffers. Charles P. Wright | 11 | 19990513 Fixes stdin stupidity and uses buffers. Charles P. Wright |
| 12 | 12 | ||
| 13 | This program is free software; you can redistribute it and/or modify | 13 | Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 14 | it under the terms of the GNU General Public License as published by | ||
| 15 | the Free Software Foundation; either version 2 of the License, or | ||
| 16 | (at your option) any later version. | ||
| 17 | |||
| 18 | This program is distributed in the hope that it will be useful, | ||
| 19 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | GNU General Public License for more details. | ||
| 22 | |||
| 23 | You should have received a copy of the GNU General Public License | ||
| 24 | along with this program; if not, write to the Free Software | ||
| 25 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 26 | */ | 14 | */ |
| 27 | 15 | ||
| 28 | #include <stdio.h> | 16 | #include <stdio.h> |
| @@ -87,8 +75,7 @@ int nc_main(int argc, char **argv) | |||
| 87 | if ((do_listen && optind != argc) || (!do_listen && optind + 2 != argc)) | 75 | if ((do_listen && optind != argc) || (!do_listen && optind + 2 != argc)) |
| 88 | bb_show_usage(); | 76 | bb_show_usage(); |
| 89 | 77 | ||
| 90 | if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) | 78 | sfd = bb_xsocket(AF_INET, SOCK_STREAM, 0); |
| 91 | bb_perror_msg_and_die("socket"); | ||
| 92 | x = 1; | 79 | x = 1; |
| 93 | if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x)) == -1) | 80 | if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x)) == -1) |
| 94 | bb_perror_msg_and_die("reuseaddr"); | 81 | bb_perror_msg_and_die("reuseaddr"); |