}
multipart(){
- local name="$1"
+ local name="$1" count="${2:-1}"
local formdata state=begin
- debug "Boundary: $multipart_boundary"
- debug "File: $multipart_cachefile"
-
- while read -r formdata; do case "$formdata" in
+ while IFS='' read -r formdata; do case "$formdata" in
"--${multipart_boundary}--${CR}")
[ $state = data ] && return 0 \
|| return 1
|| state=header
;;
"Content-Disposition: form-data; name=\"${name}\""*"${CR}")
- [ $state = header ] && state=dheader
+ [ $state = header -a $count -eq 1 ] && state=dheader
+ [ $state = header -a $count -gt 1 ] && count=$((count - 1))
[ $state = data ] && printf "%s\n" "$formdata"
;;
"${CR}")
- [ $state = dheader ] && state=data
+ if [ $state = dheader ]; then
+ # Do not use `sed -n` (or busybox sed will "convert" NULL to LF)
+ sed "/--${multipart_boundary}\(--\)\?${CR}/{x;q;}" \
+ | head -c-3
+ return 0;
+ fi
[ $state = header ] && state=junk
;;
- *)
- [ $state = data ] && printf "%s\n" "$formdata"
+ esac; done <"${multipart_cachefile}"
+}
+
+multipart_filename(){
+ local name="$1" count="${2:-1}"
+ local formdata state=begin
+
+ while read -r formdata; do case "$formdata" in
+ "--${multipart_boundary}--${CR}")
+ return 1
+ ;;
+ "--${multipart_boundary}${CR}")
+ state=header
+ ;;
+ "Content-Disposition: form-data; name=\"${name}\"; filename=\""*"\""*"${CR}")
+ [ $state = header -a $count -eq 1 ] && break
+ [ $state = header -a $count -gt 1 ] && count=$((count - 1))
+ ;;
+ "${CR}")
+ [ $state = header ] && state=junk
;;
esac; done <"${multipart_cachefile}"
+
+ filename="${formdata#*; filename=\"}"
+ filename="${filename%%\"${CR}}"
+ filename="${filename%%\";*}"
+
+ HEX_DECODE % "$filename"
}