From ad55f8cceed691f6c6e1080ba8cf8a7cbb420179 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Fri, 30 Dec 2022 11:26:49 -0700
Subject: [PATCH] Use correct dictionary file format. Also use the new
 dictionaries in the Makefile fuzz target.

---
 lib/iolog/Makefile.in                         |   4 +-
 lib/iolog/regress/fuzz/fuzz_iolog_legacy.dict |  68 +++----
 lib/iolog/regress/fuzz/fuzz_iolog_timing.dict | 166 +++++++++---------
 3 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in
index d8ca3f072..4e1f3a4bc 100644
--- a/lib/iolog/Makefile.in
+++ b/lib/iolog/Makefile.in
@@ -238,7 +238,7 @@ run-fuzz_iolog_legacy: fuzz_iolog_legacy
 	for f in $(FUZZ_IOLOG_LEGACY_CORPUS); do \
 	    cp $$f $$corpus; \
 	done; \
-	./fuzz_iolog_legacy -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
+	./fuzz_iolog_legacy -dict=$(srcdir)/regress/fuzz/fuzz_iolog_legacy.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
 
 fuzz_iolog_timing_seed_corpus.zip:
 	tdir=fuzz_iolog_timing.$$$$; \
@@ -263,7 +263,7 @@ run-fuzz_iolog_timing: fuzz_iolog_timing
 	for f in $(FUZZ_IOLOG_TIMING_CORPUS); do \
 	    cp $$f $$corpus; \
 	done; \
-	./fuzz_iolog_timing -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
+	./fuzz_iolog_timing -dict=$(srcdir)/regress/fuzz/fuzz_iolog_timing.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
 
 pre-install:
 
diff --git a/lib/iolog/regress/fuzz/fuzz_iolog_legacy.dict b/lib/iolog/regress/fuzz/fuzz_iolog_legacy.dict
index 5b4d63a34..d524d4945 100644
--- a/lib/iolog/regress/fuzz/fuzz_iolog_legacy.dict
+++ b/lib/iolog/regress/fuzz/fuzz_iolog_legacy.dict
@@ -2,41 +2,41 @@
 # timestamp:submit_user:run_user:run_group:tty:lines:columns
 # working directory
 # command [args]
-#
+
 # users and groups
-millert
-root
-bin
-wheel
-operator
-testuser
-alice
-bob
-users
-#
+"millert"
+"root"
+"bin"
+"wheel"
+"operator"
+"testuser"
+"alice"
+"bob"
+"users"
+
 # terminals
-/dev/console
-/dev/tty00
-/dev/tty01
-/dev/pts/0
-/dev/pts/1
-/dev/ttyp2
-/dev/ttyp3
-#
+"/dev/console"
+"/dev/tty00"
+"/dev/tty01"
+"/dev/pts/0"
+"/dev/pts/1"
+"/dev/ttyp2"
+"/dev/ttyp3"
+
 # directories
-/root
-/home/millert
-/home/alice
-/home/bob
-/tmp
-/usr/local
-/usr/src
-#
+"/root"
+"/home/millert"
+"/home/alice"
+"/home/bob"
+"/tmp"
+"/usr/local"
+"/usr/src"
+
 # commands
-/bin/ls
-/usr/bin/id -u
-/usr/bin/su -
-/usr/bin/mailq
-/usr/bin/make -C /usr/src/usr.bin/sort install
-/usr/bin/apt update
-/usr/bin/rpm -e sudo
+"/bin/ls"
+"/usr/bin/id -u"
+"/usr/bin/su -"
+"/usr/bin/mailq"
+"/usr/bin/make -C /usr/src/usr.bin/sort install"
+"/usr/bin/apt update"
+"/usr/bin/rpm -e sudo"
diff --git a/lib/iolog/regress/fuzz/fuzz_iolog_timing.dict b/lib/iolog/regress/fuzz/fuzz_iolog_timing.dict
index 20bfd6c7f..42bdeb564 100644
--- a/lib/iolog/regress/fuzz/fuzz_iolog_timing.dict
+++ b/lib/iolog/regress/fuzz/fuzz_iolog_timing.dict
@@ -2,88 +2,88 @@
 #   [0-4] sleep_time num_bytes
 #   5 sleep_time lines cols
 #   7 sleep_time signum|sigabbrev
-#
+
 # Signal abbreviations
-ABRT
-ALRM
-BUS
-CANCEL
-CHLD
-CLD
-CONT
-CONT
-EMT
-FPE
-FREEZE
-HUP
-ILL
-INFO
-INT
-IO
-IOT
-KILL
-LOST
-LWP	
-PIPE
-POLL
-PROF
-PWR
-QUIT
-SEGV
-STKFLT
-STOP
-STOP
-SYS
-TERM
-THAW
-TRAP
-TSTP
-TSTP
-TTIN
-TTIN
-TTOU
-TTOU
-UNUSED
-URG
-USR1
-USR2
-VTALRM
-WAITING
-WINCH
-XCPU
-XFSZ
-#
+"ABRT"
+"ALRM"
+"BUS"
+"CANCEL"
+"CHLD"
+"CLD"
+"CONT"
+"CONT"
+"EMT"
+"FPE"
+"FREEZE"
+"HUP"
+"ILL"
+"INFO"
+"INT"
+"IO"
+"IOT"
+"KILL"
+"LOST"
+"LWP"
+"PIPE"
+"POLL"
+"PROF"
+"PWR"
+"QUIT"
+"SEGV"
+"STKFLT"
+"STOP"
+"STOP"
+"SYS"
+"TERM"
+"THAW"
+"TRAP"
+"TSTP"
+"TSTP"
+"TTIN"
+"TTIN"
+"TTOU"
+"TTOU"
+"UNUSED"
+"URG"
+"USR1"
+"USR2"
+"VTALRM"
+"WAITING"
+"WINCH"
+"XCPU"
+"XFSZ"
+
 # Signal numbers, 0-32
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
+"0"
+"1"
+"2"
+"3"
+"4"
+"5"
+"6"
+"7"
+"8"
+"9"
+"10"
+"11"
+"12"
+"13"
+"14"
+"15"
+"16"
+"17"
+"18"
+"19"
+"20"
+"21"
+"22"
+"23"
+"24"
+"25"
+"26"
+"27"
+"28"
+"29"
+"30"
+"31"
+"32"