* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
+
+#if ENABLE_DESKTOP
+#include "nc_bloaty.c"
+#else
/* Lots of small differences in features
* when compared to "standard" nc
*/
-static void timeout(int signum)
+static void timeout(int signum UNUSED_PARAM)
{
bb_error_msg_and_die("timed out");
}
+int nc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int nc_main(int argc, char **argv)
{
/* sfd sits _here_ only because of "repeat" option (-l -l). */
int sfd = sfd; /* for gcc */
int cfd = 0;
unsigned lport = 0;
- SKIP_NC_SERVER(const) unsigned do_listen = 0;
- SKIP_NC_EXTRA (const) unsigned wsecs = 0;
- SKIP_NC_EXTRA (const) unsigned delay = 0;
- SKIP_NC_EXTRA (const int execparam = 0;)
- USE_NC_EXTRA (char **execparam = NULL;)
- len_and_sockaddr *lsa;
+ IF_NOT_NC_SERVER(const) unsigned do_listen = 0;
+ IF_NOT_NC_EXTRA (const) unsigned wsecs = 0;
+ IF_NOT_NC_EXTRA (const) unsigned delay = 0;
+ IF_NOT_NC_EXTRA (const int execparam = 0;)
+ IF_NC_EXTRA (char **execparam = NULL;)
fd_set readfds, testfds;
int opt; /* must be signed (getopt returns -1) */
/* getopt32 is _almost_ usable:
** it cannot handle "... -e prog -prog-opt" */
while ((opt = getopt(argc, argv,
- "" USE_NC_SERVER("lp:") USE_NC_EXTRA("w:i:f:e:") )) > 0
+ "" IF_NC_SERVER("lp:") IF_NC_EXTRA("w:i:f:e:") )) > 0
) {
- if (ENABLE_NC_SERVER && opt=='l') USE_NC_SERVER(do_listen++);
- else if (ENABLE_NC_SERVER && opt=='p') {
- USE_NC_SERVER(lport = bb_lookup_port(optarg, "tcp", 0));
- }
- else if (ENABLE_NC_EXTRA && opt=='w') USE_NC_EXTRA( wsecs = xatou(optarg));
- else if (ENABLE_NC_EXTRA && opt=='i') USE_NC_EXTRA( delay = xatou(optarg));
- else if (ENABLE_NC_EXTRA && opt=='f') USE_NC_EXTRA( cfd = xopen(optarg, O_RDWR));
- else if (ENABLE_NC_EXTRA && opt=='e' && optind<=argc) {
+ if (ENABLE_NC_SERVER && opt == 'l')
+ IF_NC_SERVER(do_listen++);
+ else if (ENABLE_NC_SERVER && opt == 'p')
+ IF_NC_SERVER(lport = bb_lookup_port(optarg, "tcp", 0));
+ else if (ENABLE_NC_EXTRA && opt == 'w')
+ IF_NC_EXTRA( wsecs = xatou(optarg));
+ else if (ENABLE_NC_EXTRA && opt == 'i')
+ IF_NC_EXTRA( delay = xatou(optarg));
+ else if (ENABLE_NC_EXTRA && opt == 'f')
+ IF_NC_EXTRA( cfd = xopen(optarg, O_RDWR));
+ else if (ENABLE_NC_EXTRA && opt == 'e' && optind <= argc) {
/* We cannot just 'break'. We should let getopt finish.
** Or else we won't be able to find where
** 'host' and 'port' params are
** (think "nc -w 60 host port -e prog"). */
- USE_NC_EXTRA(
+ IF_NC_EXTRA(
char **p;
// +2: one for progname (optarg) and one for NULL
execparam = xzalloc(sizeof(char*) * (argc - optind + 2));
argc -= optind;
// -l and -f don't mix
if (do_listen && cfd) bb_show_usage();
- // Listen or file modes need zero arguments, client mode needs 2
- if (do_listen || cfd) {
+ // File mode needs need zero arguments, listen mode needs zero or one,
+ // client mode needs one or two
+ if (cfd) {
if (argc) bb_show_usage();
+ } else if (do_listen) {
+ if (argc > 1) bb_show_usage();
} else {
if (!argc || argc > 2) bb_show_usage();
}
if (!cfd) {
if (do_listen) {
- /* create_and_bind_stream_or_die(NULL, lport)
- * would've work wonderfully, but we need
- * to know lsa */
- sfd = xsocket_stream(&lsa);
- if (lport)
- set_nport(lsa, htons(lport));
- setsockopt_reuseaddr(sfd);
- xbind(sfd, &lsa->sa, lsa->len);
+ sfd = create_and_bind_stream_or_die(argv[0], lport);
xlisten(sfd, do_listen); /* can be > 1 */
+#if 0 /* nc-1.10 does not do this (without -v) */
/* If we didn't specify a port number,
* query and print it after listen() */
if (!lport) {
- socklen_t addrlen = lsa->len;
- getsockname(sfd, &lsa->sa, &addrlen);
- lport = get_nport(lsa);
+ len_and_sockaddr lsa;
+ lsa.len = LSA_SIZEOF_SA;
+ getsockname(sfd, &lsa.u.sa, &lsa.len);
+ lport = get_nport(&lsa.u.sa);
fdprintf(2, "%d\n", ntohs(lport));
}
- fcntl(sfd, F_SETFD, FD_CLOEXEC);
+#endif
+ close_on_exec_on(sfd);
accept_again:
cfd = accept(sfd, NULL, 0);
if (cfd < 0)
if (wsecs) {
alarm(0);
- signal(SIGALRM, SIG_DFL);
+ /* Non-ignored siganls revert to SIG_DFL on exec anyway */
+ /*signal(SIGALRM, SIG_DFL);*/
}
/* -e given? */
goto accept_again;
}
/* child (or main thread if no multiple -l) */
- if (cfd) {
- dup2(cfd, 0);
- close(cfd);
- }
- dup2(0, 1);
- dup2(0, 2);
- USE_NC_EXTRA(execvp(execparam[0], execparam);)
+ xmove_fd(cfd, 0);
+ xdup2(0, 1);
+ xdup2(0, 2);
+ IF_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
/* Don't print stuff or it will go over the wire.... */
_exit(127);
}
if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0)
bb_perror_msg_and_die("select");
+#define iobuf bb_common_bufsiz1
for (fd = 0; fd < FD_SETSIZE; fd++) {
if (FD_ISSET(fd, &testfds)) {
- nread = safe_read(fd, bb_common_bufsiz1,
- sizeof(bb_common_bufsiz1));
-
+ nread = safe_read(fd, iobuf, sizeof(iobuf));
if (fd == cfd) {
if (nread < 1)
- exit(0);
+ exit(EXIT_SUCCESS);
ofd = STDOUT_FILENO;
} else {
if (nread<1) {
}
ofd = cfd;
}
-
- xwrite(ofd, bb_common_bufsiz1, nread);
+ xwrite(ofd, iobuf, nread);
if (delay > 0) sleep(delay);
}
}
}
}
+#endif
projects / oweals / busybox.git / blobdiff