cha-finger: use MAPPED_URI_*

Much simpler & more efficient than the ugly regex parsing we used
to have.

1 files changed, 15 insertions, 25 deletions

diff --git a/adapter/finger/cha-finger b/adapter/finger/cha-finger
index ea40e0ab..e963b339 100755
--- a/adapter/finger/cha-finger
+++ b/adapter/finger/cha-finger
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Finger protocol adapter for Chawan. Requires curl.
-# (It also works with w3m.)
+# (It does *not* work without the environment variables MAPPED_URI_*, so no
+# w3m support.)
 #
 # Usage: put this script in your cgi-bin folder, then add the following line to
 # your urimethodmap:
@@ -15,35 +16,24 @@ die() {
 	exit 1
 }
 
-if test -z "$QUERY_STRING"
-then	die "URL expected"
-fi
 type curl >/dev/null || \
 	die "curl must be installed on your computer to use finger."
-URL="$(printf '%s\n' "$QUERY_STRING" | \
-	sed 's/^finger:\/\///;s/^\([^[]\/:]\|\[[^]:]*\]\):79/\1/')"
 
-printf 'Content-Type: text/plain\r\n\r\n'
+printf 'Content-Type: text/plain\n\n'
 
-if printf '%s\n' "$URL" | grep -q '^\([^[]/]*\)\|\(\[[^]]*\]\):[0-9]'
-then	die "Invalid port"
-fi
+PORT="${MAPPED_URI_PORT:-79}"
+test "$PORT" = 79 || die "Invalid port"
 
-case "$URL" in
-*@*)	USER="$(printf '%s\n' "$URL" | sed 's/@.*//')"
-	HOST="$(printf '%s\n' "$URL" | \
-		tail -c +$((${#USER} + 2)) | \
-		sed 's/\/.*//')"
-	;;
-*/w*)	HOST="$(printf '%s\n' "$URL" | sed 's/\/.*//')"
-	USER="/w $(printf '%s\n' "$URL" | tail -c +$((${#HOST} + 4)))"
-	;;
-*)	HOST="$(printf '%s\n' "$URL" | sed 's/\/.*//')"
-	USER="$(printf '%s\n' "$URL" | tail -c +$((${#HOST} + 2)))"
-	;;
-esac
+if test -n "$MAPPED_URI_USERNAME"
+then	USER="$MAPPED_URI_USERNAME"
+else	case "$MAPPED_URI_PATH" in
+	/w*) USER="/w ${MAPPED_URI_PATH#/w}" ;;
+	*) USER="$MAPPED_URI_PATH" ;;
+	esac
+fi
+URL="telnet://$MAPPED_URI_HOST:$PORT"
 
 printf '%s\r\n' "$USER" | if test -n "$ALL_PROXY"
-then	curl -x "$ALL_PROXY" -- "telnet://$HOST:79"
-else	curl -- "telnet://$HOST:79"
+then	curl -x "$ALL_PROXY" -- "$URL"
+else	curl -- "$URL"
 fi 2>/dev/null