From 0b1c99ffb1c3019e8afb9dcc542fbc5e868baef1 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 16 Aug 2016 18:38:49 +1200
Subject: Template traps in scripts depending on mktd(1)

---
 bin/rndl    | 49 --------------------------------
 bin/rndl.m4 | 35 +++++++++++++++++++++++
 bin/tlcs    | 92 -------------------------------------------------------------
 bin/tlcs.m4 | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
 bin/try     | 77 ---------------------------------------------------
 bin/try.m4  | 63 ++++++++++++++++++++++++++++++++++++++++++
 bin/urlc    | 76 --------------------------------------------------
 bin/urlc.m4 | 64 ++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 240 insertions(+), 294 deletions(-)
 delete mode 100755 bin/rndl
 create mode 100644 bin/rndl.m4
 delete mode 100755 bin/tlcs
 create mode 100644 bin/tlcs.m4
 delete mode 100755 bin/try
 create mode 100644 bin/try.m4
 delete mode 100755 bin/urlc
 create mode 100644 bin/urlc.m4

(limited to 'bin')

diff --git a/bin/rndl b/bin/rndl
deleted file mode 100755
index 2ac3bf47..00000000
--- a/bin/rndl
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Print a random line from input
-
-# If there are no arguments, we're checking stdin; this is more complicated
-# than checking file arguments because we have to count the lines in order to
-# correctly choose a random one, and two passes means we require a temporary
-# file if we don't want to read all of the input into memory (!)
-if [ "$#" -eq 0 ] ; then
-
-    # Try to create the temporary directory with mktd(1) safely
-    td=
-    cleanup() {
-        [ -n "$td" ] && rm -fr -- "$td"
-        if [ "$1" != EXIT ] ; then
-            trap - "$1"
-            kill "-$1" "$$"
-        fi
-    }
-    for sig in EXIT HUP INT TERM ; do
-        # shellcheck disable=SC2064
-        trap "cleanup $sig" "$sig"
-    done
-    td=$(mktd rndl) || exit
-
-    # We'll operate on stdin in the temp directory; write the script's stdin to
-    # it with cat(1)
-    set -- "$td"/stdin
-    cat >"$td"/stdin
-fi
-
-# Count the number of lines in the input
-lc=$(sed -- '$=;d' "$@") || exit
-
-# If there were none, bail
-case $lc in
-    ''|0)
-        printf 2>&1 'rndl: No lines found on input\n'
-        exit 2
-        ;;
-esac
-
-# Try to get a random seed from rnds(1) for rndi(1)
-seed=$(rnds)
-
-# Get a random line number from rndi(1)
-ri=$(rndi 1 "$lc" "$seed") || exit
-
-# Print the line using sed(1)
-sed -- "$ri"'!d' "$@"
diff --git a/bin/rndl.m4 b/bin/rndl.m4
new file mode 100644
index 00000000..85b21545
--- /dev/null
+++ b/bin/rndl.m4
@@ -0,0 +1,35 @@
+#!/bin/sh
+# Print a random line from input
+
+# If there are no arguments, we're checking stdin; this is more complicated
+# than checking file arguments because we have to count the lines in order to
+# correctly choose a random one, and two passes means we require a temporary
+# file if we don't want to read all of the input into memory (!)
+if [ "$#" -eq 0 ] ; then
+
+include(`include/mktd.trap.sh')
+    # We'll operate on stdin in the temp directory; write the script's stdin to
+    # it with cat(1)
+    set -- "$td"/stdin
+    cat >"$td"/stdin
+fi
+
+# Count the number of lines in the input
+lc=$(sed -- '$=;d' "$@") || exit
+
+# If there were none, bail
+case $lc in
+    ''|0)
+        printf 2>&1 'rndl: No lines found on input\n'
+        exit 2
+        ;;
+esac
+
+# Try to get a random seed from rnds(1) for rndi(1)
+seed=$(rnds)
+
+# Get a random line number from rndi(1)
+ri=$(rndi 1 "$lc" "$seed") || exit
+
+# Print the line using sed(1)
+sed -- "$ri"'!d' "$@"
diff --git a/bin/tlcs b/bin/tlcs
deleted file mode 100755
index dcd76c7d..00000000
--- a/bin/tlcs
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-# Execute a command and tag the output of the stdout and stderr streams.
-self=tlcs
-
-# Set the default prefixes and suffixes for stdout/err
-out_pref='stdout: '
-err_pref='stderr: '
-out_suff=
-err_suff=
-
-# Parse options out, give help if necessary
-while getopts 'co:e:' opt ; do
-    case $opt in
-        c)
-            color=1
-            ;;
-        o)
-            out_pref=$OPTARG
-            ;;
-        e)
-            err_pref=$OPTARG
-            ;;
-        \?)
-            printf >&2 'Unknown option %s\n' "$opt"
-            exit 2
-            ;;
-    esac
-done
-shift "$((OPTIND-1))"
-
-# We need at least one more argument
-if [ "$#" -eq 0 ] ; then
-    printf >&2 '%s: Need a command to run\n' "$self"
-    exit 2
-fi
-
-# If color was requested for the output, try and get a count of available
-# colors
-[ -n "$color" ] && color_count=$( {
-    tput colors || tput Co
-} 2>/dev/null )
-
-# If the color count is greater than 7, we'll color the output
-if [ "$((color_count >= 8))" -eq 1 ] ; then
-
-    # Color code for resetting
-    color_reset=$( {
-        tput me || tput sgr0
-    } 2>/dev/null )
-
-    # If stdout is a terminal, color it
-    if [ -t 1 ] ; then
-        color_stdout=$( {
-            tput AF 2 || tput setaf 2
-        } 2>/dev/null )
-        out_pref=${color_stdout}${out_pref}
-        out_suff=${out_suff}${color_reset}
-    fi
-
-    # If stderr is a terminal, color it
-    if [ -t 2 ] ; then
-        color_stderr=$( {
-            tput AF 1 || tput setaf 1
-        } 2>/dev/null )
-        err_pref=${color_stderr}${err_pref}
-        out_suff=${err_suff}${color_reset}
-    fi
-fi
-
-# Temporary directory for the FIFOs
-td=
-cleanup() {
-    [ -n "$td" ] && rm -fr -- "$td"
-    if [ "$1" != EXIT ] ; then
-        trap - "$1"
-        kill "-$1" "$$"
-    fi
-}
-for sig in EXIT HUP INT TERM ; do
-    # shellcheck disable=SC2064
-    trap "cleanup $sig" "$sig"
-done
-td=$(mktd "$self") || exit
-
-# Execute the command, passing stdout and stderr to tl(1) calls as appropriate
-# via named pipes
-out=$td/out err=$td/err
-mkfifo -- "$out" "$err" || exit
-tl -p "$out_pref" -s "$out_suff" < "$out" &
-tl -p "$err_pref" -s "$err_suff" < "$err" &
-"$@" >"$out" 2>"$err"
-ex=$? ; wait ; exit "$ex"
diff --git a/bin/tlcs.m4 b/bin/tlcs.m4
new file mode 100644
index 00000000..ff01cc0d
--- /dev/null
+++ b/bin/tlcs.m4
@@ -0,0 +1,78 @@
+#!/bin/sh
+# Execute a command and tag the output of the stdout and stderr streams.
+self=tlcs
+
+# Set the default prefixes and suffixes for stdout/err
+out_pref='stdout: '
+err_pref='stderr: '
+out_suff=
+err_suff=
+
+# Parse options out, give help if necessary
+while getopts 'co:e:' opt ; do
+    case $opt in
+        c)
+            color=1
+            ;;
+        o)
+            out_pref=$OPTARG
+            ;;
+        e)
+            err_pref=$OPTARG
+            ;;
+        \?)
+            printf >&2 'Unknown option %s\n' "$opt"
+            exit 2
+            ;;
+    esac
+done
+shift "$((OPTIND-1))"
+
+# We need at least one more argument
+if [ "$#" -eq 0 ] ; then
+    printf >&2 '%s: Need a command to run\n' "$self"
+    exit 2
+fi
+
+# If color was requested for the output, try and get a count of available
+# colors
+[ -n "$color" ] && color_count=$( {
+    tput colors || tput Co
+} 2>/dev/null )
+
+# If the color count is greater than 7, we'll color the output
+if [ "$((color_count >= 8))" -eq 1 ] ; then
+
+    # Color code for resetting
+    color_reset=$( {
+        tput me || tput sgr0
+    } 2>/dev/null )
+
+    # If stdout is a terminal, color it
+    if [ -t 1 ] ; then
+        color_stdout=$( {
+            tput AF 2 || tput setaf 2
+        } 2>/dev/null )
+        out_pref=${color_stdout}${out_pref}
+        out_suff=${out_suff}${color_reset}
+    fi
+
+    # If stderr is a terminal, color it
+    if [ -t 2 ] ; then
+        color_stderr=$( {
+            tput AF 1 || tput setaf 1
+        } 2>/dev/null )
+        err_pref=${color_stderr}${err_pref}
+        out_suff=${err_suff}${color_reset}
+    fi
+fi
+
+include(`include/mktd.trap.sh')
+# Execute the command, passing stdout and stderr to tl(1) calls as appropriate
+# via named pipes
+out=$td/out err=$td/err
+mkfifo -- "$out" "$err" || exit
+tl -p "$out_pref" -s "$out_suff" < "$out" &
+tl -p "$err_pref" -s "$err_suff" < "$err" &
+"$@" >"$out" 2>"$err"
+ex=$? ; wait ; exit "$ex"
diff --git a/bin/try b/bin/try
deleted file mode 100755
index f0ba317d..00000000
--- a/bin/try
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-# Attempt a certain number of times to perform a task, buffer stderr unless and
-# until all command attempts fail
-self=try
-
-# Parse options
-while getopts 's:n:' opt ; do
-    case $opt in
-        n)
-            attn=$OPTARG
-            ;;
-        s)
-            sleep=$OPTARG
-            ;;
-        \?)
-            printf >&2 '%s: Unknown option\n' "$self"
-            exit 2
-            ;;
-    esac
-done
-shift "$((OPTIND-1))"
-
-# Check we have at least one argument left (the command to run)
-if [ "$#" -eq 0 ] ; then
-    printf >&2 '%s: Need a command to run\n' "$self"
-    exit 2
-fi
-
-# Create a buffer file for the error output, and clean up the file when we exit
-td=
-cleanup() {
-    [ -n "$td" ] && rm -fr -- "$td"
-    if [ "$1" != EXIT ] ; then
-        trap - "$1"
-        kill "-$1" "$$"
-    fi
-}
-for sig in EXIT HUP INT TERM ; do
-    # shellcheck disable=SC2064
-    trap "cleanup $sig" "$sig"
-done
-td=$(mktd "$self") || exit
-errbuff=$td/errbuff
-
-# Open a filehandle to the error buffer, just to save on file operations
-exec 3>"$errbuff"
-
-# Keep trying the command, writing error output to the buffer file, and exit
-# if we succeed on any of them
-attc=1
-: "${attn:=3}" "${sleep:=0}"
-while [ "$attc" -le "$attn" ] ; do
-
-    # Try running the command; if it succeeds, we're done, and any previous
-    # failures get their errors discarded
-    if "$@" 2>&3 ; then
-        exit
-
-    # If the command failed, record the exit value
-    else
-        ex=$?
-    fi
-
-    # If this isn't the last run, have a sleep
-    if [ "$attc" -lt "$attn" ] ; then
-        sleep "${sleep:=0}"
-    fi
-
-    # Increment the attempt count
-    attc=$((attc + 1))
-done
-
-# Attempts were exhausted, and all failed; print the error output from all of
-# the failures and exit with the non-zero exit value of the most recent one
-exec 3>&-
-cat -- "$td"/errbuff >&2
-exit "$ex"
diff --git a/bin/try.m4 b/bin/try.m4
new file mode 100644
index 00000000..359a4280
--- /dev/null
+++ b/bin/try.m4
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Attempt a certain number of times to perform a task, buffer stderr unless and
+# until all command attempts fail
+self=try
+
+# Parse options
+while getopts 's:n:' opt ; do
+    case $opt in
+        n)
+            attn=$OPTARG
+            ;;
+        s)
+            sleep=$OPTARG
+            ;;
+        \?)
+            printf >&2 '%s: Unknown option\n' "$self"
+            exit 2
+            ;;
+    esac
+done
+shift "$((OPTIND-1))"
+
+# Check we have at least one argument left (the command to run)
+if [ "$#" -eq 0 ] ; then
+    printf >&2 '%s: Need a command to run\n' "$self"
+    exit 2
+fi
+
+include(`include/mktd.trap.sh')
+# Open a filehandle to the error buffer, just to save on file operations
+errbuff=$td/errbuff
+exec 3>"$errbuff"
+
+# Keep trying the command, writing error output to the buffer file, and exit
+# if we succeed on any of them
+attc=1
+: "${attn:=3}" "${sleep:=0}"
+while [ "$attc" -le "$attn" ] ; do
+
+    # Try running the command; if it succeeds, we're done, and any previous
+    # failures get their errors discarded
+    if "$@" 2>&3 ; then
+        exit
+
+    # If the command failed, record the exit value
+    else
+        ex=$?
+    fi
+
+    # If this isn't the last run, have a sleep
+    if [ "$attc" -lt "$attn" ] ; then
+        sleep "${sleep:=0}"
+    fi
+
+    # Increment the attempt count
+    attc=$((attc + 1))
+done
+
+# Attempts were exhausted, and all failed; print the error output from all of
+# the failures and exit with the non-zero exit value of the most recent one
+exec 3>&-
+cat -- "$td"/errbuff >&2
+exit "$ex"
diff --git a/bin/urlc b/bin/urlc
deleted file mode 100755
index 63f075bf..00000000
--- a/bin/urlc
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# Try to find erroneous or insecure URLs
-self=urlc
-
-# cURL request timeout
-tm=${URLCHECK_TIMEOUT:-8}
-
-# Create buffer files for the headers and body content, to be cleaned up on
-# exit
-td=
-cleanup() {
-    [ -n "$td" ] && rm -fr -- "$td"
-    if [ "$1" != EXIT ] ; then
-        trap - "$1"
-        kill "-$1" "$$"
-    fi
-}
-for sig in EXIT HUP INT TERM ; do
-    # shellcheck disable=SC2064
-    trap "cleanup $sig" "$sig"
-done
-td=$(mktd "$self") || exit
-list=$td/list head=$td/head body=$td/body
-
-# Iterate through input; ignore leading/trailing whitespace
-# shellcheck disable=SC2002
-cat -- "${@:--}" >"$list"
-while read -r url ; do
-
-    # Skip anything that doesn't start with HTTP
-    case $url in
-        http*) ;;
-        *) continue ;;
-    esac
-
-    # Make initial request, log head and body to files, cry and skip on error
-    if ! curl -A Mozilla -fHLsS -D "$head" -m "$tm" -o "$body" -- \
-       "$url" ; then
-        printf >&2 '%s: %s raises error\n' \
-            "$self" "$url"
-        ex=1
-        continue
-    fi
-
-    # Iterate through header file, cry about the first redirect we find
-    while IFS=': ' read -r header value ; do
-        [ "$header" = 'Location' ] || continue
-        printf >&2 '%s: %s redirects to %s\n' \
-            "$self" "$url" "$value" >&2
-        ex=1
-        break
-    done < "$head"
-
-    # Skip anything that's already secure
-    case $url in
-        https*) continue ;;
-        *) ;;
-    esac
-
-    # Form a naïve attempt at a possible secure URL and try to request it,
-    # point it out if it actually works
-    burl=${url#http://}
-    surl=https://$burl
-    if curl -A Mozilla -fLsS -D "$head" -m "$tm" -o "$body" -- \
-       "$surl" 2>/dev/null ; then
-        printf >&2 '%s: %s has a working secure version at %s\n' \
-            "$self" "$url" "$surl"
-        ex=1
-    fi
-done <"$list"
-
-# Wait for the input process to finish
-wait
-
-# Exit if any errors
-exit "${ex:-0}"
diff --git a/bin/urlc.m4 b/bin/urlc.m4
new file mode 100644
index 00000000..c49c1ecf
--- /dev/null
+++ b/bin/urlc.m4
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Try to find erroneous or insecure URLs
+self=urlc
+
+# cURL request timeout
+tm=${URLCHECK_TIMEOUT:-8}
+
+include(`include/mktd.trap.sh')
+# Create buffer files for the headers and body content, to be cleaned up on
+# exit
+list=$td/list head=$td/head body=$td/body
+
+# Iterate through input; ignore leading/trailing whitespace
+# shellcheck disable=SC2002
+cat -- "${@:--}" >"$list"
+while read -r url ; do
+
+    # Skip anything that doesn't start with HTTP
+    case $url in
+        http*) ;;
+        *) continue ;;
+    esac
+
+    # Make initial request, log head and body to files, cry and skip on error
+    if ! curl -A Mozilla -fHLsS -D "$head" -m "$tm" -o "$body" -- \
+       "$url" ; then
+        printf >&2 '%s: %s raises error\n' \
+            "$self" "$url"
+        ex=1
+        continue
+    fi
+
+    # Iterate through header file, cry about the first redirect we find
+    while IFS=': ' read -r header value ; do
+        [ "$header" = 'Location' ] || continue
+        printf >&2 '%s: %s redirects to %s\n' \
+            "$self" "$url" "$value" >&2
+        ex=1
+        break
+    done < "$head"
+
+    # Skip anything that's already secure
+    case $url in
+        https*) continue ;;
+        *) ;;
+    esac
+
+    # Form a naïve attempt at a possible secure URL and try to request it,
+    # point it out if it actually works
+    burl=${url#http://}
+    surl=https://$burl
+    if curl -A Mozilla -fLsS -D "$head" -m "$tm" -o "$body" -- \
+       "$surl" 2>/dev/null ; then
+        printf >&2 '%s: %s has a working secure version at %s\n' \
+            "$self" "$url" "$surl"
+        ex=1
+    fi
+done <"$list"
+
+# Wait for the input process to finish
+wait
+
+# Exit if any errors
+exit "${ex:-0}"
-- 
cgit v1.2.3