wok-tiny rev 57

busybox: add nc & ether-wake
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jul 07 17:57:16 2011 +0200 (2011-07-07)
parents a6c790a4eca9
children 5a16a50be476
files busybox/stuff/busybox-1.18.config busybox/stuff/httpd_helper.sh
line diff
     1.1 --- a/busybox/stuff/busybox-1.18.config	Thu May 19 15:41:35 2011 +0200
     1.2 +++ b/busybox/stuff/busybox-1.18.config	Thu Jul 07 17:57:16 2011 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Busybox version: 1.18.2
     1.7 -# Sun Jan 30 19:02:22 2011
     1.8 +# Busybox version: 1.18.4
     1.9 +# Thu Jul  7 14:56:29 2011
    1.10  #
    1.11  CONFIG_HAVE_DOT_CONFIG=y
    1.12  
    1.13 @@ -701,9 +701,9 @@
    1.14  # Networking Utilities
    1.15  #
    1.16  # CONFIG_NBDCLIENT is not set
    1.17 -# CONFIG_NC is not set
    1.18 -# CONFIG_NC_SERVER is not set
    1.19 -# CONFIG_NC_EXTRA is not set
    1.20 +CONFIG_NC=y
    1.21 +CONFIG_NC_SERVER=y
    1.22 +CONFIG_NC_EXTRA=y
    1.23  # CONFIG_NC_110_COMPAT is not set
    1.24  # CONFIG_FEATURE_IPV6 is not set
    1.25  # CONFIG_FEATURE_UNIX_LOCAL is not set
    1.26 @@ -715,7 +715,7 @@
    1.27  # CONFIG_FEATURE_BRCTL_FANCY is not set
    1.28  # CONFIG_FEATURE_BRCTL_SHOW is not set
    1.29  # CONFIG_DNSD is not set
    1.30 -# CONFIG_ETHER_WAKE is not set
    1.31 +CONFIG_ETHER_WAKE=y
    1.32  # CONFIG_FAKEIDENTD is not set
    1.33  CONFIG_FTPD=y
    1.34  CONFIG_FEATURE_FTP_WRITE=y
     2.1 --- a/busybox/stuff/httpd_helper.sh	Thu May 19 15:41:35 2011 +0200
     2.2 +++ b/busybox/stuff/httpd_helper.sh	Thu Jul 07 17:57:16 2011 +0200
     2.3 @@ -75,7 +75,7 @@
     2.4  names=""
     2.5  IFS="&"
     2.6  for i in $2 ; do
     2.7 -	var=${i%%=*}
     2.8 +	var=${i%%[^A-Za-z_0-9]*}
     2.9  	case " $names " in
    2.10  	*\ $var\ *)	eval cnt=\$${1}_${var}_count ;;
    2.11  	*)		cnt=0
    2.12 @@ -122,8 +122,9 @@
    2.13  	n=1
    2.14  	cat > ${post}0
    2.15  	read delim < ${post}0
    2.16 +	delim=${delim%?}
    2.17  	case "$delim" in
    2.18 -	-*)	awk "/${delim%?}/ { o+=index(\$0,\"$delim\")-1; print o }
    2.19 +	-*)	awk "/$delim/ { o+=index(\$0,\"$delim\")-1; print o }
    2.20  	   		  { o+=1+length() }" < ${post}0 | while read offset; do
    2.21  		    if [ $offset -ne 0 ]; then
    2.22  			ddcut $last $offset < ${post}0 > $post$n 2> /dev/null
    2.23 @@ -140,6 +141,7 @@
    2.24  			case "$line" in
    2.25  			*Content-Disposition*)
    2.26  			    name=$(echo $line | sed 's/.* name="\([^"]*\)".*$/\1/')
    2.27 +			    name=${name%%[^A-Za-z_0-9]*}
    2.28  			    case "$line" in
    2.29  			    *filename=*) filename=$(echo $line | sed 's/.* filename="\([^"]*\)".*$/\1/') ;;
    2.30  			    esac ;;
    2.31 @@ -156,13 +158,16 @@
    2.32  				eval FILE_${name}_size=$(stat -c %s $tmp)
    2.33  				eval FILE_${name}_type=$type
    2.34  			    elif [ -n "$name" ]; then
    2.35 -				eval var=\$POST_${name}
    2.36 +			        eval cnt=\$POST_${name}_count
    2.37 +			        cnt=$(($cnt + 1))
    2.38 +				eval var=\$POST_${name}_$cnt
    2.39  				while read line; do
    2.40  					[ -n "$var" ] && var="$var
    2.41  "
    2.42 -					var="$line"
    2.43 +					var="$var$line"
    2.44  				done
    2.45 -				eval POST_${name}="\$var"
    2.46 +				eval POST_${name}_$cnt="\$var"
    2.47 +				eval POST_${name}_count=$cnt
    2.48  				case " $POST__NAMES " in
    2.49  				*\ $name\ *) ;;
    2.50  				*) POST__NAMES="$POST__NAMES $name"