From bff6c78acc943025f838651509163254c2ea0ba6 Mon Sep 17 00:00:00 2001
From: Kevin Bowling <kevin.bowling@kev009.com>
Date: Tue, 14 Jul 2026 12:56:35 -0700
Subject: [PATCH] hissqlite-util: print -d tokens as @hex@ like other INN tools

-d used bare hex; switch to the usual @...@ form and use hex()
instead of stripping quote()'s X'...' output.
---
 doc/pod/hissqlite-util.pod          |  4 ++--
 history/hissqlite/hissqlite-util.in | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/pod/hissqlite-util.pod b/doc/pod/hissqlite-util.pod
index 9ceef3ded..da2682a5b 100644
--- a/doc/pod/hissqlite-util.pod
+++ b/doc/pod/hissqlite-util.pod
@@ -53,8 +53,8 @@ counts.
 
 Dump all history records as text, one per line: the hash in hexadecimal,
 the arrival, posting, and expiration timestamps (in seconds since epoch),
-and the storage API token in hexadecimal (or C<remembered> for a token-less
-entry).
+and the storage API token in its usual textual form, hexadecimal surrounded
+with C<@> (or C<remembered> for a token-less entry).
 
 =item B<-h>
 
diff --git a/history/hissqlite/hissqlite-util.in b/history/hissqlite/hissqlite-util.in
index 73e2b7ddc..6b7a8e91a 100644
--- a/history/hissqlite/hissqlite-util.in
+++ b/history/hissqlite/hissqlite-util.in
@@ -144,11 +144,11 @@ sub count_entries {
 sub dump_history {
     my $statement;
 
-    # quote(token) renders a BLOB as X'...' uppercase hex, or NULL for a
-    # remembered entry; hex(hash) renders the hash as uppercase hex.
+    # hex() renders a BLOB as uppercase hex, or NULL for a remembered entry's
+    # missing token.
     $statement = $dbh->prepare(
         q{
-            select hex(hash), arrived, posted, expires, quote(token)
+            select hex(hash), arrived, posted, expires, hex(token)
                 from hist;
         },
     );
@@ -158,11 +158,13 @@ sub dump_history {
         my ($hash, $arrived, $posted, $expires, $token) = @row;
         $posted = defined($posted) ? $posted : '-';
         $expires = defined($expires) ? $expires : '-';
-        if (!defined($token) || (uc($token) eq 'NULL')) {
+        if (!defined($token)) {
             $token = 'remembered';
         } else {
-            # quote() returns the token in the form X'...'; keep the hex part.
-            $token = uc(substr($token, 2, -1));
+            # The token column stores the raw storage API token, so its hex
+            # surrounded with @ is exactly INN's textual token form, as
+            # rendered by TokenToText() and used in a hisv6 history file.
+            $token = '@' . $token . '@';
         }
         print "$hash $arrived $posted $expires $token\n";
     }