From 4dcc3606a8e9671ea95f97ece1cbc27a8cac15f1 Mon Sep 17 00:00:00 2001 From: Vadim Zhukov Date: Thu, 16 Aug 2018 13:34:39 +0300 Subject: [PATCH 1/2] Use in-base ftp(1) on OpenBSD instead of cURL. --- share/cht.sh.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/share/cht.sh.txt b/share/cht.sh.txt index 7ed1b7c..9d7b8b5 100755 --- a/share/cht.sh.txt +++ b/share/cht.sh.txt @@ -39,6 +39,22 @@ if echo $KSH_VERSION | grep -q ' 93' && ! local foo 2>/dev/null; then alias local=typeset fi +# any better test not involving either OS matching or actual query? +if [ `uname -s` = OpenBSD ] && [ -x /usr/bin/ftp ]; then + curl() { + local opt args="-U curl/7.61.0 -o -" + while getopts "b:s" opt; do + case $opt in + b) args="$args -c $OPTARG";; + s) args="$args -M -V";; + *) echo "internal error: unsupported cURL option '$opt'" >&2; exit 1;; + esac + done + shift $(($OPTIND - 1)) + /usr/bin/ftp $args "$@" + } +fi + get_query_options() { local query="$*" From ff15f883343f24109efa4624ec37aeb207d45e57 Mon Sep 17 00:00:00 2001 From: Vadim Zhukov Date: Thu, 16 Aug 2018 14:43:30 +0300 Subject: [PATCH 2/2] No need for OpenBSD ftp(1) to mimic cURL after a8348037acf7c7010cc8fb9e83792f13fa12cc46 . --- share/cht.sh.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/cht.sh.txt b/share/cht.sh.txt index 9d7b8b5..f54c004 100755 --- a/share/cht.sh.txt +++ b/share/cht.sh.txt @@ -42,7 +42,7 @@ fi # any better test not involving either OS matching or actual query? if [ `uname -s` = OpenBSD ] && [ -x /usr/bin/ftp ]; then curl() { - local opt args="-U curl/7.61.0 -o -" + local opt args="-o -" while getopts "b:s" opt; do case $opt in b) args="$args -c $OPTARG";;