X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=multipart.sh;h=02f7dfbb61c26a2c6ca23d2e3d301cc465990aeb;hb=HEAD;hp=09b17653346116b64ab80dcc513a3ba39c41d6da;hpb=9f3c496629ba6140270523d9865f8be86c726db9;p=shellwiki

diff --git a/multipart.sh b/multipart.sh
old mode 100644
new mode 100755
index 09b1765..02f7dfb
--- a/multipart.sh
+++ b/multipart.sh
@@ -3,6 +3,20 @@
 [ "$include_multipart" ] && return 0
 inlude_multipart="$0"
 
+# Copyright 2022 - 2023 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 if [ "${CONTENT_TYPE}" -a ! "${CONTENT_TYPE##multipart/form-data;*}" ]; then
   multipart_boundary="${CONTENT_TYPE#*; boundary=}"
   multipart_boundary="${multipart_boundary%%;*}"
@@ -34,10 +48,10 @@ multipart_cache() {
 }
 
 multipart(){
-  local name="$1"
+  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
@@ -47,15 +61,45 @@ multipart(){
                         || 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"
 }