From f492fccc9cebbfa91083c345b9bb06d283f6fe93 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 14 Jan 2015 13:59:10 -0600 Subject: Switch netcat to stop parsing command line at first nonoption argument instead of stopping after -l or -L. Hyejin Kim tried "toyboxd nc nc -p 1234 -l rm mv ps" (which attempted to run "nc rm mv ps") and "toybox nc -l -p 1234" (which attempted to run "-p 1234") and found the behavior confusing. So make it work like xargs, where all netcat options have to come before the start of any child command. --- toys/other/netcat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toys/other/netcat.c b/toys/other/netcat.c index 58f08251..dcb982d4 100644 --- a/toys/other/netcat.c +++ b/toys/other/netcat.c @@ -5,7 +5,7 @@ * TODO: udp, ipv6, genericize for telnet/microcom/tail-f USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_BIN)) -USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("tl^L^")"w#p#s:q#f:", TOYFLAG_BIN)) +USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#p#s:q#f:", TOYFLAG_BIN)) config NETCAT bool "netcat" -- cgit v1.2.3