1 files changed, 29 insertions, 17 deletions

diff --git a/src/write-tty b/src/write-tty
index fbe62ea..8fdb78f 100644
--- a/src/write-tty
+++ b/src/write-tty
@@ -10,7 +10,7 @@ output_filter()
 chr()
 {
         declare -i n="$*"
-        printf "\\$(printf %o "$n")"
+        printf "$(printf '\%o' "$n")"
 }
 
 colorize()
@@ -20,25 +20,29 @@ colorize()
         while read -r
         do
                 case "$REPLY" in
-                        \\[0-7][0-7][0-7] ) ;;
+                        \\[0-7][0-7][0-7] )
+                                declare -i c=8#"${REPLY#?}"
+                        ;;
+                        \\U[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F] )
+                                declare -i c=16#"${REPLY#??}"
+                        ;;
                         * )
                                 printf '%s\n' "$REPLY"
                                 continue
                                 ;;
                 esac
-                declare -i c=8#"${REPLY#?}"
                 if (( c > 128 + 127 ))
                 then
                         :
                 elif (( c > 128 + 32 ))
                 then
-                        printf -v REPLY "M-$(chr c - 128)"
+                        REPLY=M-$(chr c - 128)
                 elif (( c > 127 ))
                 then
-                        printf -v REPLY "M-^$(chr c - 128 + 64)"
+                        REPLY=M-^$(chr c - 128 + 64)
                 elif (( c < 32 ))
                 then
-                        printf -v REPLY "^$(chr c + 64)"
+                        REPLY=^$(chr c + 64)
                 fi
                 printf $'\e[106m%s\e[m\n' "$REPLY"
         done
@@ -48,7 +52,7 @@ tokenize()
 {
         BASH_ARGV0=tokenize
         echo -n "$0" >/proc/$BASHPID/comm
-        while read -r -N1
+        while read -r -n1 -d ''
         do
                 if [[ "$REPLY" =~ [[:print:]] ]]
                 then
@@ -56,13 +60,26 @@ tokenize()
                         # multibyte unicode character.
                         printf '%s\n' "$REPLY"
                         continue
-                else
+                elif [ "$REPLY" ]
+                then
                         # If it is a non-printable, then we output a
                         # multi-character line. In this case we colorize it
                         # later so that it won't be confused with multiple
-                        # printable characters in the .
-                        printf '\\%.3o\n' "'$REPLY"
-                        continue
+                        # printable characters.
+                        bytelen=$(LC_ALL=C; echo ${#REPLY})
+                        if (( bytelen == 1 ))
+                        then
+                                printf '\\%.3o\n' "'$REPLY"
+                        else
+                                hexdigits=$(LC_ALL=C; for ((i=0; i<$bytelen; ++i))
+                                do
+                                        printf '%.2x' "'${REPLY:$i:1}"
+                                        printf '%.2x\n' "'${REPLY:$i:1}" >&2
+                                done)
+                                printf '%s%.8x\n' '\U' 0x"$hexdigits"
+                        fi
+                else
+                        printf '\\%.3o\n' 0
                 fi
         done
 }
@@ -81,9 +98,4 @@ soft_cursor()
         done
 }
 
-if [ -t 1 ]
-then
-        output_filter
-else
-        exec -a write-tty-raw socat - -
-fi
+output_filter