X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=multipart.sh;h=7c0d5dd2da631cf9babe05726f678087c9c389c5;hb=696420310ff6a3ac680935ef50985f0d37c61ad9;hp=70270f68f1c3f91830af52e22847f6887ee27081;hpb=2afe9b76c613f3edf74ebd2156e1ae78ac971960;p=shellwiki

diff --git a/multipart.sh b/multipart.sh
old mode 100644
new mode 100755
index 70270f6..7c0d5dd
--- a/multipart.sh
+++ b/multipart.sh
@@ -37,7 +37,7 @@ multipart(){
   local name="$1" count="${2:-1}"
   local formdata state=begin
 
-  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
@@ -52,12 +52,14 @@ multipart(){
       [ $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}"
 }
 
@@ -79,8 +81,6 @@ multipart_filename(){
     "${CR}")
       [ $state = header ] && state=junk
       ;;
-    *):
-      ;;
   esac; done <"${multipart_cachefile}"
 
   filename="${formdata#*; filename=\"}"