From eba1f23023740c771569759c320c95b890ac33f9 Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Wed, 27 Mar 2024 00:23:07 -0700
Subject: [PATCH] mua: replace uriencode

---
 include/mua.sh | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/include/mua.sh b/include/mua.sh
index 8ca7556d..88bbcc94 100755
--- a/include/mua.sh
+++ b/include/mua.sh
@@ -86,21 +86,37 @@ test_pop3()
 		"pop3s://$(uriencode $MUA_TEST_USER):$(uriencode MUA_TEST_PASS)@${MUA_TEST_HOST}/"
 }
 
-# https://stackoverflow.com/questions/296536/how-to-urlencode-data-for-curl-command
-# shellcheck disable=3005,3018,3024,3045,3057
 uriencode() {
-  local string="${1}"
-  local strlen=${#string}
-  local encoded=""
-  local pos c o
-
-  for (( pos=0 ; pos<strlen ; pos++ )); do
-     c=${string:$pos:1}
-     case "$c" in
-        [-_.~a-zA-Z0-9] ) o="${c}" ;;
-        * )               printf -v o '%%%02x' "'$c"
-     esac
-     encoded+="${o}"
-  done
-  echo "${encoded}"
+  s="${1//'%'/%25}"
+  s="${s//' '/%20}"
+  s="${s//'!'/%21}"
+  s="${s//'"'/%22}"
+  s="${s//'#'/%23}"
+  s="${s//'$'/%24}"
+  s="${s//'&'/%26}"
+  s="${s//"'"/%27}"
+  s="${s//'('/%28}"
+  s="${s//')'/%29}"
+  s="${s//'*'/%2A}"
+  s="${s//'+'/%2B}"
+  s="${s//','/%2C}"
+  s="${s//'-'/%2D}"
+  s="${s//'.'/%2E}"
+  s="${s//'/'/%2F}"
+  s="${s//':'/%3A}"
+  s="${s//';'/%3B}"
+  s="${s//'='/%3D}"
+  s="${s//'?'/%3F}"
+  s="${s//'@'/%40}"
+  s="${s//'['/%5B}"
+  s="${s//'\'/%5C}"
+  s="${s//']'/%5D}"
+  s="${s//'^'/%5E}"
+  s="${s//'_'/%5F}"
+  s="${s//'`'/%60}"
+  s="${s//'{'/%7B}"
+  s="${s//'|'/%7C}"
+  s="${s//'}'/%7D}"
+  s="${s//'~'/%7E}"
+  printf %s "$s"
 }