From c8ad718b729a58a7cdc62c485efbe6266510d9ad Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Fri, 25 Apr 2025 15:18:46 -0500
Subject: [PATCH] Add a simple no option hd.

---
 toys/other/hd.c        | 62 ++++++++++++++++++++++++++++++++++++++++++
 toys/pending/hexdump.c |  9 ------
 2 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 toys/other/hd.c

diff --git a/toys/other/hd.c b/toys/other/hd.c
new file mode 100644
index 00000000..6817e843
--- /dev/null
+++ b/toys/other/hd.c
@@ -0,0 +1,62 @@
+/* hd.c - Display traditional 16 byte/line hex+ascii.
+ *
+ * Copyright 2025 Rob Landley <rob@landley.net>
+ *
+ * No standard
+
+USE_HD(NEWTOY(hd, 0, TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF))
+
+config HD
+  bool "hd"
+  default y
+  help
+    usage: hd [FILE...]
+
+    Display traditional 16 byte/line ascii+hex.
+*/
+
+#define FOR_hd
+#include "toys.h"
+
+GLOBALS(
+    long len;
+    int pos;
+    char flush[16];
+)
+
+static void flush(void)
+{
+  int i;
+
+  if (!TT.pos) return;
+  printf("%*c", 3*(17-TT.pos)+(TT.pos<8), '|');
+  for (i = 0; i<TT.pos; i++)
+    putchar((TT.flush[i]<32 || TT.flush[i]>127) ? '.' : TT.flush[i]);
+  printf("|\n");
+  TT.pos = 0;
+}
+
+static void do_hd(int fd, char *name)
+{
+  int off, len;
+
+  while (0<(len = xread(fd, toybuf, sizeof(toybuf)))) {
+    for (off = 0; off<len; off++) {
+      if (!TT.pos) printf("%08lx", TT.len);
+      TT.len++;
+      printf("  %02x"+!!(TT.pos&7), toybuf[off]);
+      TT.flush[TT.pos++] = toybuf[off];
+      if (TT.pos==16) flush();
+    }
+  }
+}
+
+void hd_main(void)
+{
+  int pos;
+
+  loopfiles(toys.optargs, do_hd);
+  pos = TT.pos;
+  flush();
+  if (pos) printf("%08lx\n", TT.len);
+}
diff --git a/toys/pending/hexdump.c b/toys/pending/hexdump.c
index 7d824c61..03368a94 100644
--- a/toys/pending/hexdump.c
+++ b/toys/pending/hexdump.c
@@ -8,7 +8,6 @@
  *  - Implement format strings (see man (1) hexdump)
 
 USE_HEXDUMP(NEWTOY(hexdump, "bcCdn#<0os#<0vx[!bcCdox]", TOYFLAG_USR|TOYFLAG_BIN))
-USE_HD(OLDTOY(hd, hexdump, TOYFLAG_USR|TOYFLAG_BIN))
 
 config HEXDUMP
   bool "hexdump"
@@ -25,14 +24,6 @@ config HEXDUMP
     Display type:
     -b One byte octal   -c One byte character -C Canonical (hex + ASCII)
     -d Two byte decimal -o Two byte octal     -x Two byte hexadecimal (default)
-
-config HD
-  bool "hd"
-  default n
-  help
-    usage: hd [FILE...]
-
-    Display file(s) in cannonical hex+ASCII format.
 */
 
 #define FOR_hexdump
-- 
2.39.5