Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/nc.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/nc.c (modified) (9 diffs)

branches/3.3/mindi-busybox/networking/nc.c

@@ -9 +9 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 //config:config NC
@@ -25 +26 @@
 //config:
 //config:config NC_EXTRA
-//config:   bool "Netcat extensions (-eiw and filename)"
+//config:   bool "Netcat extensions (-eiw and -f FILE)"
 //config:   default y
 //config:   depends on NC
@@ -41 +42 @@
 //config:     The code is about 2.5k bigger. It enables
 //config:     -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-//config:     busybox-specific extensions: -f FILE and -ll.
+//config:     busybox-specific extensions: -f FILE.
 
 #if ENABLE_NC_110_COMPAT
@@ -61 +62 @@
 //usage:       "Open a pipe to IP:PORT" IF_NC_EXTRA(" or FILE")
 //usage:    NC_OPTIONS_STR
-//usage:    IF_NC_EXTRA(
-//usage:     "\n    -e PROG Run PROG after connect"
 //usage:    IF_NC_SERVER(
 //usage:     "\n    -l  Listen mode, for inbound connects"
 //usage:    IF_NC_EXTRA(
-//usage:     "\n        (use -l twice with -e for persistent server)")
+//usage:     "\n        (use -ll with -e for persistent server)"
+//usage:    )
 //usage:     "\n    -p PORT Local port"
 //usage:    )
-//usage:     "\n    -w SEC  Timeout for connect"
+//usage:    IF_NC_EXTRA(
+//usage:     "\n    -w SEC  Connect timeout"
 //usage:     "\n    -i SEC  Delay interval for lines sent"
 //usage:     "\n    -f FILE Use file (ala /dev/ttyS0) instead of network"
+//usage:     "\n    -e PROG Run PROG after connect"
 //usage:    )
 //usage:
@@ -148 +150 @@
                     }
                 )
-                /* optind points to argv[arvc] (NULL) now.
+                /* optind points to argv[argc] (NULL) now.
                 ** FIXME: we assume that getopt will not count options
                 ** possibly present on "-e PROG ARGS" and will not
@@ -227 +229 @@
         xmove_fd(cfd, 0);
         xdup2(0, 1);
-        xdup2(0, 2);
+        /*xdup2(0, 2); - original nc 1.10 does this, we don't */
         IF_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
-        /* Don't print stuff or it will go over the wire... */
-        _exit(127);
+        IF_NC_EXTRA(bb_perror_msg_and_die("can't execute '%s'", execparam[0]);)
     }
 
@@ -239 +240 @@
     FD_SET(STDIN_FILENO, &readfds);
 
+#define iobuf bb_common_bufsiz1
+    setup_common_bufsiz();
     for (;;) {
         int fd;
@@ -249 +252 @@
             bb_perror_msg_and_die("select");
 
-#define iobuf bb_common_bufsiz1
         fd = STDIN_FILENO;
         while (1) {
             if (FD_ISSET(fd, &testfds)) {
-                nread = safe_read(fd, iobuf, sizeof(iobuf));
+                nread = safe_read(fd, iobuf, COMMON_BUFSIZE);
                 if (fd == cfd) {
                     if (nread < 1)
@@ -262 +264 @@
                         /* Close outgoing half-connection so they get EOF,
                          * but leave incoming alone so we can see response */
-                        shutdown(cfd, 1);
+                        shutdown(cfd, SHUT_WR);
                         FD_CLR(STDIN_FILENO, &readfds);
                     }