From be6e70ffde1ef213166b19330cf9418f9bad2f3b Mon Sep 17 00:00:00 2001
From: Stefan Kreutz <mail@skreutz.com>
Date: Thu, 18 May 2023 21:56:36 +0200
Subject: Use clap without wrap_help feature

With the wrap_help feature, clap tries to determine the terminal width
using the terminal-size crate. This involves access to the temporary
directory, violating the stdio pledge on OpenBSD and thus aborting the
process.

This commit disables clap's wrap_help feature to keep the simple stdio
pledge. Another solution could to pledge stdio and tmppath.
---
 Cargo.lock               | 11 -----------
 wpa-psk-cli/CHANGELOG.md |  4 ++++
 wpa-psk-cli/Cargo.toml   |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 585167a..bd8c165 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -127,7 +127,6 @@ dependencies = [
  "bitflags",
  "clap_lex",
  "strsim",
- "terminal_size",
 ]
 
 [[package]]
@@ -435,16 +434,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "terminal_size"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
-dependencies = [
- "rustix",
- "windows-sys",
-]
-
 [[package]]
 name = "termtree"
 version = "0.4.1"
diff --git a/wpa-psk-cli/CHANGELOG.md b/wpa-psk-cli/CHANGELOG.md
index 1143585..54ff7ad 100644
--- a/wpa-psk-cli/CHANGELOG.md
+++ b/wpa-psk-cli/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep A Changelog][] and this project adheres to
 
 ## Unreleased
 
+### Fixed
+
+- Abort on OpenBSD when printing help.
+
 ## [0.1.3] - 2023-05-14
 
 ### Changed
diff --git a/wpa-psk-cli/Cargo.toml b/wpa-psk-cli/Cargo.toml
index 4e1309f..a59ee2b 100644
--- a/wpa-psk-cli/Cargo.toml
+++ b/wpa-psk-cli/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["command-line-utilities"]
 publish = true
 
 [dependencies]
-clap = { version = "4.2.7", features = ["derive", "wrap_help"] }
+clap = { version = "4.2.7", features = ["derive"] }
 wpa-psk = { path = "../wpa-psk", version = "0.2.2" }
 
 [target.'cfg(target_os = "openbsd")'.dependencies]
-- 
cgit v1.2.3