Merge commit '6bc502434737d7f08379e79b94fc6fda424ef779'

[shellwiki] / multipart.sh

diff --git a/multipart.sh b/multipart.sh
index 09e3ca8f256fd1bd598c9175150eb74aa78e7762..02f7dfbb61c26a2c6ca23d2e3d301cc465990aeb 100755 (executable)
--- 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%%;*}"
@@ -53,8 +67,9 @@ multipart(){
       ;;
     "${CR}")
       if [ $state = dheader ]; then
-        sed -n "/--${multipart_boundary}\(--\)\?${CR}/q; p;" \
-        | head -c-2
+        # 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