From 9b5fc10933565c2375f10c5b8ed66fb3f262a314 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Tue, 7 Nov 2017 14:02:26 +0100
Subject: [PATCH] mail-wrapper: Support systems where /proc/fd isn't fully
 functional

---
 mail/wrapper/mail-wrapper | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/mail/wrapper/mail-wrapper b/mail/wrapper/mail-wrapper
index 9097453..9593749 100755
--- a/mail/wrapper/mail-wrapper
+++ b/mail/wrapper/mail-wrapper
@@ -50,10 +50,28 @@ syntax_error() {
 	usage 2
 }
 
+clean_up() {
+	if [[ -z "$proc_fd_works" ]]; then
+		ax_debug "Cleaning temporary files ..."
+		[[ -n "$buffer_file" ]] && rm -f "$buffer_file"
+		[[ -n "$error_file" ]] && rm -f "$error_file"
+	fi
+}
+
+case "$(uname)" in
+	"Darwin")
+		unset proc_fd_works
+		;;
+	*)
+		proc_fd_works=1
+esac
+
 # Initialize internal state.
 unset is_error
 host=$(hostname -f 2>/dev/null || hostname)
 
+trap clean_up EXIT
+
 # Some defaults (can be adjusted by command line parameters).
 unset do_errors_only
 unset subject
@@ -115,9 +133,11 @@ buffer_file=$(mktemp) \
 ax_debug "buffer_file=\"$buffer_file\""
 exec 3>"$buffer_file" \
 	|| ax_abort -l "Failed to redirect FD #3 to buffer file!"
-rm "$buffer_file" \
-	|| ax_error -l "Failed to delete buffer file: \"$buffer_file\"!"
-buffer_file="/dev/fd/3"
+if [[ -n "$proc_fd_works" ]]; then
+	rm "$buffer_file" \
+		|| ax_error -l "Failed to delete buffer file: \"$buffer_file\"!"
+	buffer_file="/dev/fd/3"
+fi
 
 if [[ $# -gt 0 ]]; then
 	# Execute command and save output in buffer file.
@@ -127,9 +147,11 @@ if [[ $# -gt 0 ]]; then
 	ax_debug "error_file=\"$error_file\""
 	exec 4>"$error_file" \
 		|| ax_abort -l "Failed to redirect FD #4 to error file!"
-	rm "$error_file" \
-		|| ax_error -l "Failed to delete error buffer file: \"$error_file\"!"
-	error_file="/dev/fd/4"
+	if [[ -n "$proc_fd_works" ]]; then
+		rm "$error_file" \
+			|| ax_error -l "Failed to delete error buffer file: \"$error_file\"!"
+		error_file="/dev/fd/4"
+	fi
 
 	job=$(basename "$1")
 
-- 
2.39.2