From 25976f00db371edf90959fe351b7dfed07d1356a Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Sun, 31 May 2020 10:07:03 -0500
Subject: Handle different charsets

---
 bollux | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/bollux b/bollux
index ce80322..63dfe85 100755
--- a/bollux
+++ b/bollux
@@ -9,6 +9,7 @@ PRGN="${0##*/}"
 VRSN=0.2.2
 # State
 REDIRECTS=0
+set -f
 
 bollux_usage() {
 	cat <<END
@@ -350,25 +351,25 @@ handle_response() {
 }
 
 display() {
-	case "$1" in
-	*\;*)
-		mime="${1%;*}"
-		charset="${1#*;}"
-		trim "$mime"
-		trim "$charset"
-		log d "$mime $charset"
-		;;
-	*) mime="$(trim "$1")" ;;
-	esac
+	# split header line
+	local -a hdr
+	IFS=$'\n' read -d "" -ra hdr <<<"${1//;/$'\n'}"
+
+	mime="${hdr[0],,}"
+	for h in "${hdr[@]}"; do
+		h="$(trim "$h")"
+		log d "$h"
+		case "$h" in
+		charset=*) charset="${h#charset=}" ;;
+		esac
+	done
 
 	[[ -z "$mime" ]] && mime="text/gemini"
 	if [[ -z "$charset" ]]; then
 		charset="utf-8"
-	else
-		charset="${charset#charset=}"
 	fi
 
-	log debug "mime=$mime; charset=$charset"
+	log debug "mime='$mime'; charset='$charset'"
 
 	case "$mime" in
 	text/*)
@@ -387,6 +388,7 @@ display() {
 			log d "typeset_$submime"
 			{
 				normalize_crlf |
+					iconv -f "${charset^^}" -t "UTF-8" - |
 					tee "$BOLLUX_PAGESRC" |
 					run "typeset_$submime" |
 					run "${less_cmd[@]}"
@@ -395,6 +397,7 @@ display() {
 			log "cat"
 			{
 				normalize_crlf |
+					iconv -f "${charset^^}" -t "UTF-8" - |
 					tee "$BOLLUX_PAGESRC" |
 					run "${less_cmd[@]}"
 			} || run handle_keypress "$?"
-- 
cgit 1.4.1-21-gabe81