From 475b3fc2b10893c4e3e41122f7851e17ec673f3d Mon Sep 17 00:00:00 2001
From: mike-ward <mike@mike-ward.net>
Date: Sun, 23 Jun 2024 11:11:40 -0500
Subject: [PATCH 1/5] implement unexpand

---
 README.md                    |  14 +-
 src/unexpand/args.v          |  79 ++++++++
 src/unexpand/delete.me       |   0
 src/unexpand/unexpand.v      | 347 +++++++++++++++++++++++++++++++++++
 src/unexpand/unexpand_test.v |  43 +++++
 5 files changed, 476 insertions(+), 7 deletions(-)
 create mode 100644 src/unexpand/args.v
 delete mode 100644 src/unexpand/delete.me
 create mode 100644 src/unexpand/unexpand.v
 create mode 100644 src/unexpand/unexpand_test.v

diff --git a/README.md b/README.md
index 92a75b5c..8fe1cece 100644
--- a/README.md
+++ b/README.md
@@ -38,15 +38,15 @@ Contributions are welcome!
 Please only contribute versions of the original utilities written in V.
 Contributions written in other languages will likely be rejected.
 
-When your contribution is finalized, don't forget to update the completed 
+When your contribution is finalized, don't forget to update the completed
 count below and mark it as done in this README.md. Thanks!
 
-**NOTE: When testing on Windows**, comparison tests are currently run against 
-[uutils/coreutils](https://github.com/uutils/coreutils), a Rust re-implementation of 
-GNU coreutils. They are not 100% compatiable. If you encounter different behaviors, 
+**NOTE: When testing on Windows**, comparison tests are currently run against
+[uutils/coreutils](https://github.com/uutils/coreutils), a Rust re-implementation of
+GNU coreutils. They are not 100% compatiable. If you encounter different behaviors,
 compare against the true GNU coreutils version on the Linux-based tests first.
 
-## Completed (60/109)
+## Completed (62/109)
 
 |  Done   | Cmd       | Descripton                                       |
 | :-----: | --------- | ------------------------------------------------ |
@@ -95,7 +95,7 @@ compare against the true GNU coreutils version on the Linux-based tests first.
 |         | link      | Make a hard link via the link syscall            |
 | &check; | ln        | Make links between files                         |
 | &check; | logname   | Print current login name                         |
-|         | ls        | List directory contents                          |
+| &check; | ls        | List directory contents                          |
 | &check; | md5sum    | Print or check MD5 digests                       |
 | &check; | mkdir     | Make directories                                 |
 |         | mkfifo    | Make FIFOs (named pipes)                         |
@@ -149,7 +149,7 @@ compare against the true GNU coreutils version on the Linux-based tests first.
 |         | tsort     | Topological sort                                 |
 | &check; | tty       | Print file name of terminal on standard input    |
 | &check; | uname     | Print system information                         |
-|         | unexpand  | Convert spaces to tabs                           |
+| &check; | unexpand  | Convert spaces to tabs                           |
 | &check; | uniq      | Uniquify files                                   |
 | &check; | unlink    | Remove files via the unlink syscall              |
 | &check; | uptime    | Print system uptime and load                     |
diff --git a/src/unexpand/args.v b/src/unexpand/args.v
new file mode 100644
index 00000000..8c11533c
--- /dev/null
+++ b/src/unexpand/args.v
@@ -0,0 +1,79 @@
+import common
+import flag
+import os
+import time
+
+const app_name = 'unexpand'
+const spaces = flag.space
+
+struct Options {
+	all        bool
+	first_only bool
+	tabs       string
+	files      []string
+}
+
+fn get_options() Options {
+	mut fp := common.flag_parser(os.args)
+	fp.application(app_name)
+	fp.description('Convert spaces to tabs')
+	fp.arguments_description('[files]')
+
+	all := fp.bool('all', `a`, false, 'convert all blanks instead of just initial blanks')
+	first_only := fp.bool('first-only', ` `, false, 'convert only leading sequences of blanks (overrides -a)')
+	tabs := fp.string('list', `t`, '', 'use comma separated list of tab positions.\n${spaces}' +
+		"The last specified position can be prefixed with '/'\n${spaces}" +
+		'to specify a tab size to use after the last$\n${spaces}' +
+		"explicitly specified tab stop.  Also a prefix of '+'\n${spaces}" +
+		'can be used to align remaining tab stops relative to$\n${spaces}' +
+		'the last specified tab stop instead of the first column\n')
+	files := fp.finalize() or { exit_error(err.msg()) }
+
+	return Options{
+		all: all
+		first_only: first_only
+		tabs: tabs
+		files: scan_files_arg(files)
+	}
+}
+
+fn scan_files_arg(files_arg []string) []string {
+	mut files := []string{}
+
+	for file in files_arg {
+		if file == '-' {
+			files << stdin_to_tmp()
+			continue
+		}
+		files << file
+	}
+
+	if files.len == 0 {
+		files << stdin_to_tmp()
+	}
+
+	return files
+}
+
+const tmp_pattern = '/${app_name}-tmp-'
+
+fn stdin_to_tmp() string {
+	tmp := '${os.temp_dir()}/${tmp_pattern}${time.ticks()}'
+	os.create(tmp) or { exit_error(err.msg()) }
+	mut f := os.open_append(tmp) or { exit_error(err.msg()) }
+	defer { f.close() }
+
+	for {
+		s := os.get_raw_line()
+		if s.len == 0 {
+			break
+		}
+		f.write_string(s) or { exit_error(err.msg()) }
+	}
+	return tmp
+}
+
+@[noreturn]
+fn exit_error(msg string) {
+	common.exit_with_error_message(app_name, msg)
+}
diff --git a/src/unexpand/delete.me b/src/unexpand/delete.me
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/unexpand/unexpand.v b/src/unexpand/unexpand.v
new file mode 100644
index 00000000..220b48ff
--- /dev/null
+++ b/src/unexpand/unexpand.v
@@ -0,0 +1,347 @@
+import os
+
+struct App {
+	options Options
+mut:
+	// If true, convert blanks even after nonblank characters have been read on the line.
+	convert_entire_line bool
+	// If nonzero, the size of all tab stops.  If zero, use 'tab_list' instead.
+	tab_size int
+	// If nonzero, the size of all tab stops after the last specified.
+	extend_size int
+	// If nonzero, an increment for additional tab stops after the last specified.
+	increment_size int
+	// The maximum distance between tab stops.
+	max_column_width int
+	// Array of the explicit column numbers of the tab stops;
+	// after 'tab_list' is exhausted, each additional tab is replaced
+	// by a space.  The first column is column 0.
+	tab_list []int
+	// The number of allocated entries in 'tab_list'.
+	n_tabs_allocated int
+	// The index of the first invalid element of 'tab_list',
+	// where the next element can be added.
+	first_free_tab int
+}
+
+fn main() {
+	mut app := App{
+		options: get_options()
+	}
+
+	app.convert_entire_line = app.options.all
+
+	if app.options.tabs.len > 0 {
+		app.convert_entire_line = true
+		parse_tab_stops(app.options.tabs.bytes(), mut app)
+	}
+	if app.options.first_only {
+		app.convert_entire_line = false
+	}
+
+	finalize_tab_stops(mut app)
+	unexpand(mut app)
+}
+
+fn unexpand(mut app App) {
+	for file in app.options.files {
+		unexpand_file(file, mut app)
+	}
+}
+
+fn unexpand_file(file string, mut app App) {
+	// The array of pending blanks.  In non-POSIX locales, blanks can
+	// include characters other than spaces, so the blanks must be
+	// stored, not merely counted.
+	// char *pending_blank;
+	mut pending_blank := []rune{len: app.max_column_width}
+
+	lines := os.read_lines(file) or { exit_error(err.msg()) }
+	for line in lines {
+		// If true, perform translations.
+		mut convert := true
+		// The following variables have valid values only when CONVERT is true:
+		// g of next input character.
+		mut column := 0
+		// Column the next input tab stop is on.
+		mut next_tab_column := 0
+		// Index in TAB_LIST of next tab stop to examine.
+		mut tab_index := 0
+		// If true, the first pending blank came just before a tab stop.  */
+		mut one_blank_before_tab_stop := false
+		// If true, the previous input character was a blank.  This is
+		// initially true, since initial strings of blanks are treated
+		// as if the line was preceded by a blank.
+		mut prev_blank := true
+		// Number of pending columns of blanks.
+		mut pending := 0
+		// Convert a line of text.
+
+		for mut c in line.runes() {
+			if convert {
+				blank := c == ` ` || c == `\t`
+				if blank {
+					mut last_tab := false
+					next_tab_column, tab_index, last_tab = get_next_tab_column(column,
+						tab_index, mut app)
+					// println('${next_tab_column} ${tab_index} ${last_tab}')
+
+					if last_tab {
+						convert = false
+					}
+					if convert {
+						if next_tab_column < column {
+							exit_error('1input line is too long')
+						}
+						if c == `\t` {
+							column = next_tab_column
+
+							if pending > 0 {
+								pending_blank[0] = `\t`
+							}
+						} else {
+							column += 1
+							if !(prev_blank && column == next_tab_column) {
+								// It is not yet known whether the pending
+								// blanks will be replaced by tabs.
+								if column == next_tab_column {
+									one_blank_before_tab_stop = true
+								}
+								pending_blank[pending] = c
+								pending += 1
+								prev_blank = true
+								continue
+							}
+
+							// Replace the pending blanks by a tab or two.
+							c = `\t`
+							pending_blank[0] = c
+						}
+
+						// Discard pending blanks, unless it was a single
+						// blank just before the previous tab stop.
+						pending = if one_blank_before_tab_stop { 1 } else { 0 }
+					}
+				} else if c == `\b` {
+					// Go back one column, and force recalculation of the
+					// next tab stop.
+					column -= if column > 0 { 1 } else { 0 }
+					next_tab_column = column
+					tab_index -= if tab_index > 0 { 1 } else { 0 }
+				} else {
+					column += 1
+					if column == 0 {
+						exit_error('1input line is too long')
+					}
+				}
+
+				if pending > 0 {
+					if pending > 1 && one_blank_before_tab_stop {
+						pending_blank[0] = `\t`
+					}
+					print(pending_blank[..pending].string())
+					pending = 0
+					one_blank_before_tab_stop = false
+				}
+
+				prev_blank = blank
+				convert = convert && (app.convert_entire_line || blank)
+			}
+
+			if c < 0 {
+				return
+			}
+
+			print(c)
+		}
+
+		println('')
+	}
+}
+
+fn get_next_tab_column(column int, tab_index_arg int, mut app App) (int, int, bool) {
+	mut tab_index := tab_index_arg
+
+	// single tab-size - return multiples of it
+	if app.tab_size > 0 {
+		return column + (app.tab_size - column % app.tab_size), tab_index, false
+	}
+
+	// multiple tab-sizes - iterate them until the tab
+	// position is beyondthe current input column.
+	for ; tab_index < app.first_free_tab; tab_index++ {
+		tab := app.tab_list[tab_index]
+		if column < tab {
+			return tab, tab_index, false
+		}
+	}
+
+	// relative last tab - return multiples of it
+	if app.extend_size > 0 {
+		return column + (app.extend_size - column % app.extend_size), tab_index, false
+	}
+
+	// incremental last tab - add increment_size to the previous tab stop
+	if app.increment_size > 0 {
+		end_tab := app.tab_list[app.first_free_tab - 1]
+		return column + (app.increment_size - ((column - end_tab) % app.increment_size)), tab_index, false
+	}
+
+	return 0, tab_index, true
+}
+
+// Check that the list of tab stops TABS, with ENTRIES
+// entries,contains only nonzero, ascending values.
+fn validate_tab_stops(tabs []int, entries int, app App) {
+	mut prev_tab := 0
+
+	for i := 0; i < entries; i++ {
+		if tabs[i] == 0 {
+			exit_error('tab size cannot be 0')
+		}
+		if tabs[i] <= prev_tab {
+			exit_error('tab sizes must be ascending')
+		}
+		prev_tab = tabs[i]
+	}
+
+	if app.increment_size > 0 && app.extend_size > 0 {
+		exit_error("'/' specifier is mutually exclusive with '+'")
+	}
+}
+
+// Called after all command-line options have been parsed,
+//   and add_tab_stop/parse_tab_stops have been called.
+//   Will validate the tab-stop values,
+//     and set the final values to:
+//     tab-stops = 8 (if no tab-stops given on command line)
+//     tab-stops = N (if value N specified as the only value).
+//     tab-stops = distinct values given on command line (if multiple values given).
+fn finalize_tab_stops(mut app App) {
+	validate_tab_stops(app.tab_list, app.first_free_tab, app)
+
+	if app.first_free_tab == 0 {
+		if app.max_column_width == app.extend_size {
+			if app.extend_size > 0 {
+				app.tab_size = app.extend_size
+			} else if app.increment_size > 0 {
+				app.tab_size = app.increment_size
+			} else {
+				app.tab_size = 8
+			}
+		}
+		app.max_column_width = app.tab_size
+	} else if app.first_free_tab == 1 && app.extend_size == 0 && app.increment_size == 0 {
+		app.tab_size = app.tab_list[0]
+	} else {
+		app.tab_size = 0
+	}
+}
+
+// Add the comma or blank separated list of tab stops STOPS
+// to the list of tab stops.
+fn parse_tab_stops(stops []u8, mut app App) {
+	mut have_tabval := false
+	mut tabval := 0
+	mut extend_tabval := false
+	mut increment_tabval := false
+	// mut num_start := []u8{}
+	mut ok := true
+
+	for stop in stops {
+		if stop == `,` || stop == ` ` {
+			if have_tabval {
+				if extend_tabval {
+					if !set_extend_size(tabval, mut app) {
+						ok = false
+						break
+					}
+				} else if increment_tabval {
+					if set_increment_size(tabval, mut app) {
+						ok = false
+						break
+					}
+				} else {
+					add_tab_stop(tabval, mut app)
+				}
+			}
+			have_tabval = false
+		} else if stop == `/` {
+			if have_tabval {
+				exit_error("'/' specifier not at start of number: %s")
+				ok = false
+			}
+			extend_tabval = true
+			increment_tabval = false
+		} else if stop == `+` {
+			if have_tabval {
+				exit_error("'+' specifier not at start of number: %s")
+				ok = false
+			}
+			increment_tabval = true
+			extend_tabval = false
+		} else if stop.is_digit() {
+			if !have_tabval {
+				tabval = 0
+				have_tabval = true
+			}
+			tabval += tabval * 10 + int(stop - `0`)
+		} else {
+			exit_error('tab size contains invalid character(s): %s')
+			ok = false
+			break
+		}
+	}
+
+	if ok && have_tabval {
+		if extend_tabval {
+			ok = set_extend_size(tabval, mut app) && ok
+		} else if increment_tabval {
+			ok = set_increment_size(tabval, mut app) && ok
+		} else {
+			add_tab_stop(tabval, mut app)
+		}
+	}
+
+	if !ok {
+		exit_error('bonk')
+	}
+}
+
+fn set_extend_size(tabval int, mut app App) bool {
+	mut ok := true
+	if app.extend_size > 0 {
+		exit_error("'/' specifier only allowed with the last value")
+		ok = false
+	}
+	app.extend_size = tabval
+	return ok
+}
+
+fn set_increment_size(tabval int, mut app App) bool {
+	mut ok := true
+	if app.increment_size > 0 {
+		exit_error("'+' specifier only allowed with the last value")
+		ok = false
+	}
+	app.increment_size = tabval
+	return ok
+}
+
+// Add tab stop TABVAL to the end of 'tab_list'.
+fn add_tab_stop(tabval int, mut app App) {
+	prev_column := if app.first_free_tab > 0 { app.tab_list[app.first_free_tab - 1] } else { 0 }
+	column_width := if prev_column <= tabval { tabval - prev_column } else { 0 }
+
+	if app.first_free_tab == app.n_tabs_allocated {
+		app.tab_list << tabval
+		app.first_free_tab += 1
+		app.n_tabs_allocated += 1
+	}
+	if app.max_column_width < column_width {
+		if 0xffff < column_width {
+			exit_error('tabs are too far apart')
+		}
+		app.max_column_width = column_width
+	}
+}
diff --git a/src/unexpand/unexpand_test.v b/src/unexpand/unexpand_test.v
new file mode 100644
index 00000000..feeed1c9
--- /dev/null
+++ b/src/unexpand/unexpand_test.v
@@ -0,0 +1,43 @@
+module main
+
+import os
+import time
+
+fn write_tmp_file(content string) string {
+	tmp := '${os.temp_dir()}/${tmp_pattern}${time.ticks()}'
+	os.write_file(tmp, content) or { panic(err) }
+	return tmp
+}
+
+fn test_1() {
+	file := write_tmp_file('        a       b       c\n')
+	res := os.execute('unexpand ${file}')
+	assert res.output.bytes() == [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
+		32, 32, 99, 10]
+}
+
+fn test_2() {
+	file := write_tmp_file('a\tb\tc\td\te\tf\n')
+	res := os.execute('unexpand -t 3,+7 ${file}')
+	assert res.output.bytes() == [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
+		32, 116, 97, 98, 32, 115, 116, 111, 112, 32, 115, 112, 101, 99, 10]
+}
+
+fn test_3() {
+	file := write_tmp_file('a\tb\tc\td\te\tf\n')
+	res := os.execute('unexpand -t 3,/7 ${file}')
+	assert res.output.bytes() == [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
+		32, 116, 97, 98, 32, 115, 116, 111, 112, 32, 115, 112, 101, 99, 10]
+}
+
+fn test_4() {
+	file := write_tmp_file('a  b   c d e\n')
+	res := os.execute('unexpand -t 3,7 ${file}')
+	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 32, 100, 32, 101, 10]
+}
+
+fn test_5() {
+	file := write_tmp_file('cart\bd    bard\n')
+	res := os.execute('unexpand -a ${file}')
+	assert res.output.bytes() == [u8(99), 97, 114, 116, 8, 100, 9, 98, 97, 114, 100, 10]
+}

From 87eba5690158f4564ad46f646db02dc5a15c3c36 Mon Sep 17 00:00:00 2001
From: mike-ward <mike@mike-ward.net>
Date: Sun, 23 Jun 2024 11:26:50 -0500
Subject: [PATCH 2/5] fix test, seems to be variance with CI enviroment

---
 src/unexpand/unexpand_test.v | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/unexpand/unexpand_test.v b/src/unexpand/unexpand_test.v
index feeed1c9..0caab34d 100644
--- a/src/unexpand/unexpand_test.v
+++ b/src/unexpand/unexpand_test.v
@@ -12,15 +12,19 @@ fn write_tmp_file(content string) string {
 fn test_1() {
 	file := write_tmp_file('        a       b       c\n')
 	res := os.execute('unexpand ${file}')
-	assert res.output.bytes() == [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
-		32, 32, 99, 10]
+	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
+
+	// [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
+	// 	32, 32, 99, 10]
 }
 
 fn test_2() {
 	file := write_tmp_file('a\tb\tc\td\te\tf\n')
 	res := os.execute('unexpand -t 3,+7 ${file}')
-	assert res.output.bytes() == [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
-		32, 116, 97, 98, 32, 115, 116, 111, 112, 32, 115, 112, 101, 99, 10]
+	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
+
+	// [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
+	// 	32, 116, 97, 98, 32, 115, 116, 111, 112, 32, 115, 112, 101, 99, 10]
 }
 
 fn test_3() {

From 97c13e37752a0e9385e668fd64631d097fe845b3 Mon Sep 17 00:00:00 2001
From: mike-ward <mike@mike-ward.net>
Date: Sun, 23 Jun 2024 11:38:29 -0500
Subject: [PATCH 3/5] update correc test this time

---
 src/unexpand/unexpand_test.v | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/unexpand/unexpand_test.v b/src/unexpand/unexpand_test.v
index 0caab34d..d909cfe1 100644
--- a/src/unexpand/unexpand_test.v
+++ b/src/unexpand/unexpand_test.v
@@ -12,10 +12,8 @@ fn write_tmp_file(content string) string {
 fn test_1() {
 	file := write_tmp_file('        a       b       c\n')
 	res := os.execute('unexpand ${file}')
-	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
-
-	// [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
-	// 	32, 32, 99, 10]
+	assert res.output.bytes() == [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
+		32, 32, 99, 10]
 }
 
 fn test_2() {
@@ -30,8 +28,10 @@ fn test_2() {
 fn test_3() {
 	file := write_tmp_file('a\tb\tc\td\te\tf\n')
 	res := os.execute('unexpand -t 3,/7 ${file}')
-	assert res.output.bytes() == [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
-		32, 116, 97, 98, 32, 115, 116, 111, 112, 32, 115, 112, 101, 99, 10]
+	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
+
+	// [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
+	// 	32, 116, 97, 98, 32, 115, 116, 111, 112, 32, 115, 112, 101, 99, 10]
 }
 
 fn test_4() {

From 723d8f307cae28bdffaa87284053be317bc8a821 Mon Sep 17 00:00:00 2001
From: mike-ward <mike@mike-ward.net>
Date: Sun, 23 Jun 2024 11:54:10 -0500
Subject: [PATCH 4/5] use ./unexpand to avoid system unexpand

---
 src/unexpand/unexpand_test.v | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/unexpand/unexpand_test.v b/src/unexpand/unexpand_test.v
index d909cfe1..c9921b63 100644
--- a/src/unexpand/unexpand_test.v
+++ b/src/unexpand/unexpand_test.v
@@ -11,14 +11,14 @@ fn write_tmp_file(content string) string {
 
 fn test_1() {
 	file := write_tmp_file('        a       b       c\n')
-	res := os.execute('unexpand ${file}')
+	res := os.execute('./unexpand ${file}')
 	assert res.output.bytes() == [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
 		32, 32, 99, 10]
 }
 
 fn test_2() {
 	file := write_tmp_file('a\tb\tc\td\te\tf\n')
-	res := os.execute('unexpand -t 3,+7 ${file}')
+	res := os.execute('./unexpand -t 3,+7 ${file}')
 	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
 
 	// [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
@@ -27,7 +27,7 @@ fn test_2() {
 
 fn test_3() {
 	file := write_tmp_file('a\tb\tc\td\te\tf\n')
-	res := os.execute('unexpand -t 3,/7 ${file}')
+	res := os.execute('./unexpand -t 3,/7 ${file}')
 	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
 
 	// [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
@@ -36,12 +36,12 @@ fn test_3() {
 
 fn test_4() {
 	file := write_tmp_file('a  b   c d e\n')
-	res := os.execute('unexpand -t 3,7 ${file}')
+	res := os.execute('./unexpand -t 3,7 ${file}')
 	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 32, 100, 32, 101, 10]
 }
 
 fn test_5() {
 	file := write_tmp_file('cart\bd    bard\n')
-	res := os.execute('unexpand -a ${file}')
+	res := os.execute('./unexpand -a ${file}')
 	assert res.output.bytes() == [u8(99), 97, 114, 116, 8, 100, 9, 98, 97, 114, 100, 10]
 }

From 85a9af7c2aef54661739b812f0060128a2f07927 Mon Sep 17 00:00:00 2001
From: mike-ward <mike@mike-ward.net>
Date: Sun, 23 Jun 2024 11:58:46 -0500
Subject: [PATCH 5/5] revert, I'm not understanding something about the CI
 here. Sorry

---
 src/unexpand/unexpand_test.v | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/unexpand/unexpand_test.v b/src/unexpand/unexpand_test.v
index c9921b63..d909cfe1 100644
--- a/src/unexpand/unexpand_test.v
+++ b/src/unexpand/unexpand_test.v
@@ -11,14 +11,14 @@ fn write_tmp_file(content string) string {
 
 fn test_1() {
 	file := write_tmp_file('        a       b       c\n')
-	res := os.execute('./unexpand ${file}')
+	res := os.execute('unexpand ${file}')
 	assert res.output.bytes() == [u8(9), 97, 32, 32, 32, 32, 32, 32, 32, 98, 32, 32, 32, 32, 32,
 		32, 32, 99, 10]
 }
 
 fn test_2() {
 	file := write_tmp_file('a\tb\tc\td\te\tf\n')
-	res := os.execute('./unexpand -t 3,+7 ${file}')
+	res := os.execute('unexpand -t 3,+7 ${file}')
 	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
 
 	// [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
@@ -27,7 +27,7 @@ fn test_2() {
 
 fn test_3() {
 	file := write_tmp_file('a\tb\tc\td\te\tf\n')
-	res := os.execute('./unexpand -t 3,/7 ${file}')
+	res := os.execute('unexpand -t 3,/7 ${file}')
 	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 9, 100, 9, 101, 9, 102, 10]
 
 	// [u8(117), 110, 101, 120, 112, 97, 110, 100, 58, 32, 98, 97, 100,
@@ -36,12 +36,12 @@ fn test_3() {
 
 fn test_4() {
 	file := write_tmp_file('a  b   c d e\n')
-	res := os.execute('./unexpand -t 3,7 ${file}')
+	res := os.execute('unexpand -t 3,7 ${file}')
 	assert res.output.bytes() == [u8(97), 9, 98, 9, 99, 32, 100, 32, 101, 10]
 }
 
 fn test_5() {
 	file := write_tmp_file('cart\bd    bard\n')
-	res := os.execute('./unexpand -a ${file}')
+	res := os.execute('unexpand -a ${file}')
 	assert res.output.bytes() == [u8(99), 97, 114, 116, 8, 100, 9, 98, 97, 114, 100, 10]
 }