Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/nc_bloaty.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/nc_bloaty.c (modified) (12 diffs)

branches/3.2/mindi-busybox/networking/nc_bloaty.c

@@ -61 +61 @@
 //usage:    )
 //usage:#define nc_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n    -e PROG Run PROG after connect (must be last)"
+//usage:       "    -e PROG Run PROG after connect (must be last)"
 //usage:    IF_NC_SERVER(
 //usage:     "\n    -l  Listen mode, for inbound connects"
@@ -117 +116 @@
     unsigned wrote_net;          /* total net bytes */
 #endif
+    char *proggie0saved;
     /* ouraddr is never NULL and goes through three states as we progress:
      1 - local address before bind (IP/port possibly zero)
@@ -129 +129 @@
     jmp_buf jbuf;                /* timer crud */
 
-    /* will malloc up the following globals: */
     fd_set ding1;                /* for select loop */
     fd_set ding2;
@@ -161 +160 @@
 /* Must match getopt32 call! */
 enum {
-    OPT_h = (1 << 0),
-    OPT_n = (1 << 1),
-    OPT_p = (1 << 2),
-    OPT_s = (1 << 3),
-    OPT_u = (1 << 4),
-    OPT_v = (1 << 5),
-    OPT_w = (1 << 6),
-    OPT_l = (1 << 7) * ENABLE_NC_SERVER,
-    OPT_i = (1 << (7+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
-    OPT_o = (1 << (8+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
-    OPT_z = (1 << (9+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+    OPT_n = (1 << 0),
+    OPT_p = (1 << 1),
+    OPT_s = (1 << 2),
+    OPT_u = (1 << 3),
+    OPT_v = (1 << 4),
+    OPT_w = (1 << 5),
+    OPT_l = (1 << 6) * ENABLE_NC_SERVER,
+    OPT_i = (1 << (6+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+    OPT_o = (1 << (7+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+    OPT_z = (1 << (8+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
 };
 
@@ -265 +263 @@
 static int doexec(char **proggie)
 {
+    if (G.proggie0saved)
+        proggie[0] = G.proggie0saved;
     xmove_fd(netfd, 0);
     dup2(0, 1);
     /* dup2(0, 2); - do we *really* want this? NO!
      * exec'ed prog can do it yourself, if needed */
-    execvp(proggie[0], proggie);
-    bb_perror_msg_and_die("can't execute '%s'", proggie[0]);
+    BB_EXECVP_or_die(proggie);
 }
 
@@ -388 +387 @@
                     /* "nc -nl -p LPORT RHOST" (w/o RPORT!):
                      * we should accept any remote port */
-                    set_nport(&remend, 0); /* blot out remote port# */
+                    set_nport(&remend.u.sa, 0); /* blot out remote port# */
                 }
                 r = memcmp(&remend.u.sa, &themaddr->u.sa, remend.len);
-                set_nport(&remend, sv_port); /* restore */
+                set_nport(&remend.u.sa, sv_port); /* restore */
                 if (r != 0) {
                     /* nc 1.10 bails out instead, and its error message
@@ -431 +430 @@
         rr = getsockopt(netfd, IPPROTO_IP, IP_OPTIONS, optbuf, &x);
         if (rr >= 0 && x) {    /* we've got options, lessee em... */
-            bin2hex(bigbuf_net, optbuf, x);
-            bigbuf_net[2*x] = '\0';
+            *bin2hex(bigbuf_net, optbuf, x) = '\0';
             fprintf(stderr, "IP options: %s\n", bigbuf_net);
         }
@@ -488 +486 @@
         o_wait = 5;                     /* enough that we'll notice?? */
         rr = xsocket(ouraddr->u.sa.sa_family, SOCK_STREAM, 0);
-        set_nport(themaddr, htons(SLEAZE_PORT));
+        set_nport(&themaddr->u.sa, htons(SLEAZE_PORT));
         connect_w_timeout(rr);
         /* don't need to restore themaddr's port, it's not used anymore */
@@ -730 +728 @@
     char *str_p, *str_s;
     IF_NC_EXTRA(char *str_i, *str_o;)
-    char *themdotted = themdotted; /* gcc */
+    char *themdotted = themdotted; /* for compiler */
     char **proggie;
     int x;
@@ -758 +756 @@
             goto e_found;
         }
+        /* -<other_opts>e PROG [ARGS] ? */
+        /* (aboriginal linux uses this form) */
+        if (proggie[0][0] == '-') {
+            char *optpos = *proggie + 1;
+            /* Skip all valid opts w/o params */
+            optpos = optpos + strspn(optpos, "nuv"IF_NC_SERVER("l")IF_NC_EXTRA("z"));
+            if (*optpos == 'e' && !optpos[1]) {
+                *optpos = '\0';
+                proggie++;
+                G.proggie0saved = *proggie;
+                *proggie = NULL; /* terminate argv for getopt32 */
+                goto e_found;
+            }
+        }
     }
     proggie = NULL;
@@ -764 +776 @@
     // -g -G -t -r deleted, unimplemented -a deleted too
     opt_complementary = "?2:vv:w+"; /* max 2 params; -v is a counter; -w N */
-    getopt32(argv, "hnp:s:uvw:" IF_NC_SERVER("l")
+    getopt32(argv, "np:s:uvw:" IF_NC_SERVER("l")
             IF_NC_EXTRA("i:o:z"),
             &str_p, &str_s, &o_wait
@@ -815 +827 @@
                 x);
         if (o_lport)
-            set_nport(ouraddr, htons(o_lport));
+            set_nport(&ouraddr->u.sa, htons(o_lport));
     }
     xmove_fd(x, netfd);