From 00b9181b11e8500db2ae5821098da8c73d732355 Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Fri, 15 Dec 2023 09:27:49 -0800
Subject: [PATCH] Add 2019/burton/try.sh and other fixes/updates
The try.sh runs prog and wc side by side but in a way that is formatted
(including alignment) so it's easier to see what line is from which
program and it also runs make test.
The script cow was renamed cow.sh to help browsers with whether or not
to display or download.
The script check was renamed check.sh to help browsers with whether or
not to display or download.
The script check.sh was fixed in case the 'x' (passed in to the script
as an environmental variable) is not executable (it resets it back to
./prog) and also made to satisfy ShellCheck.
The script cow.sh was fixed for ShellCheck moo (or was it too? :-) ).
---
2019/burton/.winner.json | 4 ++--
2019/burton/Makefile | 10 +++++-----
2019/burton/README.md | 33 +++++++++++++++++++++++++--------
2019/burton/check | 17 -----------------
2019/burton/check.sh | 24 ++++++++++++++++++++++++
2019/burton/cow | 19 -------------------
2019/burton/cow.sh | 26 ++++++++++++++++++++++++++
2019/burton/index.html | 2 +-
2019/burton/inventory.html | 6 +++---
2019/burton/try.sh | 29 +++++++++++++++++++++++++++++
bugs.md | 10 ++++++++++
thanks-for-help.md | 11 +++++++++++
12 files changed, 136 insertions(+), 55 deletions(-)
delete mode 100755 2019/burton/check
create mode 100755 2019/burton/check.sh
delete mode 100755 2019/burton/cow
create mode 100755 2019/burton/cow.sh
create mode 100755 2019/burton/try.sh
diff --git a/2019/burton/.winner.json b/2019/burton/.winner.json
index 9a529607b..eb3ee5389 100644
--- a/2019/burton/.winner.json
+++ b/2019/burton/.winner.json
@@ -50,7 +50,7 @@
"winners_text" : "original source"
},
{
- "file_path" : "check",
+ "file_path" : "check.sh",
"winners_rank" : 100,
"created_by" : null,
"prog" : null,
@@ -60,7 +60,7 @@
"winners_text" : "test suite"
},
{
- "file_path" : "cow",
+ "file_path" : "cow.sh",
"winners_rank" : 100,
"created_by" : null,
"prog" : null,
diff --git a/2019/burton/Makefile b/2019/burton/Makefile
index be278696f..8ce2535fc 100644
--- a/2019/burton/Makefile
+++ b/2019/burton/Makefile
@@ -139,12 +139,12 @@ remarks: README.md
${RM} -f $@
${CP} $? $@
-correct: newlines remarks 256 check
- env out=${CAT} ${SHELL} ./check ${WC} > $@
+correct: newlines remarks 256 check.sh
+ env out=${CAT} ${SHELL} ./check.sh ${WC} > $@
-test: ${PROG} ${PROG}.clean correct check
- -${SHELL} ./check ./${PROG}
- -${SHELL} ./check ./${PROG}.clean
+test: ${PROG} ${PROG}.clean correct check.sh
+ -${SHELL} ./check.sh ./${PROG}
+ -${SHELL} ./check.sh ./${PROG}.clean
# alternative executable
#
diff --git a/2019/burton/README.md b/2019/burton/README.md
index 4684fb15c..cc473cfcd 100644
--- a/2019/burton/README.md
+++ b/2019/burton/README.md
@@ -5,17 +5,30 @@ make
```
+### Bugs and (Mis)features:
+
+The current status of this entry is:
+
+```
+STATUS: INABIAF - please **DO NOT** fix
+```
+
+For more detailed information see [2019 burton in bugs.md](/bugs.md#2019-burton).
+
+
## To use:
```sh
-./prog < prog.c
+./prog < file
+
+./cow file
```
### Try:
```sh
-echo "Do or do not. There is no try."
+./try.sh
```
@@ -30,7 +43,7 @@ unix utilities available as winning entries.
### Synopsis:
-Feed it anything on stdin.
+Feed it anything on `stdin`.
The output should look familiar.
Compiles cleanly with:
@@ -44,11 +57,11 @@ cc -Wall -Wextra -Weverything -pedantic $WARN -include stdio.h -o prog prog.c
Included is a test script, useful for the corner cases. As in all good Unix
programs, it is silent upon success; any output demonstrates an error. Instead
-of checking correctness, the check script can simply output the results: (The
-Makefile contains the spoiler):
+of checking correctness, the [check.sh](check.sh) script can simply output the
+results: (The Makefile contains the spoiler):
```sh
-out=cat ./check ./prog
+out=cat ./check.sh ./prog
```
Interestingly, and a spoiler here: macOS and FreeBSD implement the common
@@ -60,20 +73,24 @@ on these systems omit these characters from the description.
This program follows FreeBSD and macOS, the arbiters of correct for these purposes.
+
### Limits:
Requires the C locale and ASCII character set.
Input should be less than ten million octets "toavoidthisproblem".
+
### See Also:
You can enjoy this code from beginning to end.
No whitespace was harmed in the creation of this program.
All your base belong to us, but the constants seem a bit ... off?
+
### Bonus
-The script `cow` provides a closer analog, and perhaps a more useful interface.
+The script [cow.sh](cow.sh) provides a closer analog, and perhaps a more useful
+interface.
Included is a version without compilation warnings:
@@ -83,7 +100,7 @@ cc -Wall -Wextra -Weverything -pedantic -include stdio.h -o prog.clean prog.clea
### Bugs
-The flags are not supported. Although they could easily be added into `cow`.
+The flags are not supported. Although they could easily be added into `cow.sh`.
This exercise left to the reader.
diff --git a/2019/burton/check b/2019/burton/check
deleted file mode 100755
index b8f925ee5..000000000
--- a/2019/burton/check
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-x=$1
-: ${x:=./prog}
-
-: ${out:="diff - correct"}
-
-(
-/bin/echo -n | $x
-$x < /dev/null
-echo | $x
-/bin/echo -n a | $x
-echo a | $x
-$x < newlines
-$x < 256
-$x < remarks
-) | $out
diff --git a/2019/burton/check.sh b/2019/burton/check.sh
new file mode 100755
index 000000000..5be27498e
--- /dev/null
+++ b/2019/burton/check.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+x=$1
+: "${x:=./prog}"
+
+if [[ ! -x "$x" ]]; then
+ x="./prog"
+fi
+
+: "${out:="diff - correct"}"
+
+(
+/bin/echo -n | $x
+$x < /dev/null
+echo | $x
+/bin/echo -n a | $x
+echo a | $x
+$x < newlines
+# ^---^ SC2210 (warning): This is a file redirection. Was it supposed to be a comparison or fd operation?
+# Answer: 256 is a file so it is supposed to be file redirection.
+# shellcheck disable=SC2210
+$x < 256
+$x < remarks
+) | $out
diff --git a/2019/burton/cow b/2019/burton/cow
deleted file mode 100755
index 968db55eb..000000000
--- a/2019/burton/cow
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if test $# -eq 0; then
- ./prog
- exit 0
-fi
-
-args=$*
-for name in $args
-do if test -r $name; then
- s=$(./prog < $name)
- echo "$s" $name
- set -- $s
- ((a += $1))
- ((b += $2))
- ((c += $3))
- ((d += 1))
-fi; done
-((d > 1)) && printf "%8d%8d%8d total\n" $a $b $c
diff --git a/2019/burton/cow.sh b/2019/burton/cow.sh
new file mode 100755
index 000000000..0c6ef792d
--- /dev/null
+++ b/2019/burton/cow.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+if test $# -eq 0; then
+ ./prog
+ exit 0
+fi
+
+args=$*
+for name in $args
+do if test -r "$name"; then
+ s=$(./prog < "$name")
+ echo "$s" "$name"
+ # We have to disable this warning to prevent ShellCheck from being a cow.sh
+ # (or, to use Bart Simpson's advice, make it 'not have a cow.sh'), as we
+ # actually need this to happen:
+ #
+ # ^-- SC2086 (info): Double quote to prevent globbing and word splitting.
+ #
+ # shellcheck disable=SC2086
+ set -- $s
+ ((a += $1))
+ ((b += $2))
+ ((c += $3))
+ ((d += 1))
+fi; done
+((d > 1)) && printf "%8d%8d%8d total\n" "$a" "$b" "$c"
diff --git a/2019/burton/index.html b/2019/burton/index.html
index 0bf4cd72d..d14fbd2cf 100644
--- a/2019/burton/index.html
+++ b/2019/burton/index.html
@@ -25,7 +25,7 @@
-Nu Html check https://ioccc-src.github.io/temp-test-ioccc/2019/burton/index.html
+Nu Html check.sh https://ioccc-src.github.io/temp-test-ioccc/2019/burton/index.html
diff --git a/2019/burton/inventory.html b/2019/burton/inventory.html
index eaed234af..a1cdf3937 100644
--- a/2019/burton/inventory.html
+++ b/2019/burton/inventory.html
@@ -219,13 +219,13 @@ href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/2019/burton/prog.