mhsign/mhpgp: Clarify the manpages and usage lines

[mmh] / uip / mhsign.sh

diff --git a/uip/mhsign.sh b/uip/mhsign.sh
index 038052b..f28c0fe 100755 (executable)
--- a/uip/mhsign.sh
+++ b/uip/mhsign.sh
@@ -9,7 +9,7 @@
 #              will be removed and any "From " line will be indented for
 #              best compatibility. Enforced for multipart messages.
 
-usage="Usage: mhsign [-encrypt] [-mime] file"
+usage="Usage: mhsign [-encrypt] [-mime] [-Version] [-help] file"
 
 # defaults
 usemime=n
@@ -108,14 +108,17 @@ lookupkeys() {
                echo "Encryption is not supported for BCCs" >&2
                return 1
        fi
-               
-       for i in `whom -ali -tocc -nobcc "$1"` ; do
+
+       whom -ali -tocc -nobcc "$1" | while read i ; do
                case "$i" in
                '|'*)   echo "Ignoring pipe address" >&2
                        continue ;;
                *@*)    ;;
                *)      i="$i@`hostname -f`" ;;
                esac
+               # extract the actual address
+               format='%<{error}%{error}: %{text}%|%(addr{text})%>'
+               i=`%libdir%/ap -form "=$format" "$i"`
                if k=`lookupkeyfile "$i"` ; then
                        KL="$KL $k"
                elif k=`lookupkeyring "$i"` ; then