# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1310054236 -7200
# Node ID 23b3ea50ad1a9373cce3aa6af7fce800546f40c5
# Parent  a6c790a4eca92b19e6e23885bc7d5f85c4f7c809
busybox: add nc & ether-wake

diff -r a6c790a4eca9 -r 23b3ea50ad1a busybox/stuff/busybox-1.18.config
--- a/busybox/stuff/busybox-1.18.config	Thu May 19 15:41:35 2011 +0200
+++ b/busybox/stuff/busybox-1.18.config	Thu Jul 07 17:57:16 2011 +0200
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.2
-# Sun Jan 30 19:02:22 2011
+# Busybox version: 1.18.4
+# Thu Jul  7 14:56:29 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -701,9 +701,9 @@
 # Networking Utilities
 #
 # CONFIG_NBDCLIENT is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
 # CONFIG_NC_110_COMPAT is not set
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -715,7 +715,7 @@
 # CONFIG_FEATURE_BRCTL_FANCY is not set
 # CONFIG_FEATURE_BRCTL_SHOW is not set
 # CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
+CONFIG_ETHER_WAKE=y
 # CONFIG_FAKEIDENTD is not set
 CONFIG_FTPD=y
 CONFIG_FEATURE_FTP_WRITE=y
diff -r a6c790a4eca9 -r 23b3ea50ad1a busybox/stuff/httpd_helper.sh
--- a/busybox/stuff/httpd_helper.sh	Thu May 19 15:41:35 2011 +0200
+++ b/busybox/stuff/httpd_helper.sh	Thu Jul 07 17:57:16 2011 +0200
@@ -75,7 +75,7 @@
 names=""
 IFS="&"
 for i in $2 ; do
-	var=${i%%=*}
+	var=${i%%[^A-Za-z_0-9]*}
 	case " $names " in
 	*\ $var\ *)	eval cnt=\$${1}_${var}_count ;;
 	*)		cnt=0
@@ -122,8 +122,9 @@
 	n=1
 	cat > ${post}0
 	read delim < ${post}0
+	delim=${delim%?}
 	case "$delim" in
-	-*)	awk "/${delim%?}/ { o+=index(\$0,\"$delim\")-1; print o }
+	-*)	awk "/$delim/ { o+=index(\$0,\"$delim\")-1; print o }
 	   		  { o+=1+length() }" < ${post}0 | while read offset; do
 		    if [ $offset -ne 0 ]; then
 			ddcut $last $offset < ${post}0 > $post$n 2> /dev/null
@@ -140,6 +141,7 @@
 			case "$line" in
 			*Content-Disposition*)
 			    name=$(echo $line | sed 's/.* name="\([^"]*\)".*$/\1/')
+			    name=${name%%[^A-Za-z_0-9]*}
 			    case "$line" in
 			    *filename=*) filename=$(echo $line | sed 's/.* filename="\([^"]*\)".*$/\1/') ;;
 			    esac ;;
@@ -156,13 +158,16 @@
 				eval FILE_${name}_size=$(stat -c %s $tmp)
 				eval FILE_${name}_type=$type
 			    elif [ -n "$name" ]; then
-				eval var=\$POST_${name}
+			        eval cnt=\$POST_${name}_count
+			        cnt=$(($cnt + 1))
+				eval var=\$POST_${name}_$cnt
 				while read line; do
 					[ -n "$var" ] && var="$var
 "
-					var="$line"
+					var="$var$line"
 				done
-				eval POST_${name}="\$var"
+				eval POST_${name}_$cnt="\$var"
+				eval POST_${name}_count=$cnt
 				case " $POST__NAMES " in
 				*\ $name\ *) ;;
 				*) POST__NAMES="$POST__NAMES $name"