Fix uip/whom.c for C89 compatibility

[mmh] / uip / whatnow2.sh

diff --git a/uip/whatnow2.sh b/uip/whatnow2.sh
index a4a2cc5..59e91b7 100755 (executable)
--- a/uip/whatnow2.sh
+++ b/uip/whatnow2.sh
@@ -38,7 +38,7 @@ usage()
                exit 0
        fi
        printhelp 1>&2
-       exit $1
+       exit 1
 }
 
 get_editor()
@@ -73,14 +73,9 @@ get_realpath()
 {
        reldir=`dirname "$1"`
        filename=`basename "$1"`
-       cd $reldir
+       cd "$reldir"
        echo "$PWD/$filename"
-       cd -
-}
-
-get_attachmentheader()
-{
-       header=`mhparam 'Attachment-Header'`
+       cd "$OLDPWD"
 }
 
 set_lasteditor()
@@ -148,7 +143,7 @@ list()
        exec $mhshowproc -file $mhdraft
 }
 
-send()
+sendfunktion()
 {
        export mhaltmsg=`anno -list -component 'mhaltmsg' $mhmetafile`
        export mhdist=`anno -list -component 'mhdist' $mhmetafile`
@@ -156,8 +151,9 @@ send()
        export mhfolder=`anno -list -component 'mhfolder' $mhmetafile`
        export mhmessages=`anno -list -component 'mhmessages' $mhmetafile`
        export mhannotate=`anno -list -component 'mhannotate' $mhmetafile`
+       send "$@" $mhdraft || exit $?
        rm -f $mhmetafile
-       exec send "$@" $mhdraft
+       exit 0
 }
 
 delete()
@@ -170,7 +166,7 @@ delete()
 
 attach()
 {
-       get_attachmentheader
+       header=`mhparam 'Attachment-Header'`
        while [ -n "$1" ]
        do
                if [ ! -f "$1" ]
@@ -190,13 +186,13 @@ attach()
 
 alist()
 {
-       get_attachmentheader
+       header=`mhparam 'Attachment-Header'`
        anno -list -number -component $header $mhdraft
 }
 
 detach()
 {
-       get_attachmentheader
+       header=`mhparam 'Attachment-Header'`
        while [ -n "$1" ]
        do
                anno -delete -component $header -number "$1" $mhdraft
@@ -213,7 +209,7 @@ display()
 {
        mhaltmsg=`anno -list -component 'mhaltmsg' $mhmetafile`
        get_showproc
-       if [ -n "$mhaltmsg" ]
+       if [ -z "$mhaltmsg" ]
        then
                echo "no altmsg" 1>&2
                exit 1
@@ -243,7 +239,7 @@ then
                version $#
                ;;
        *)
-               echo "no current message in $draftsfolder" 1>&2
+               echo "no current message in $draftfolder" 1>&2
                usage 1
                ;;
        esac
@@ -261,9 +257,9 @@ l|li|lis|list)
        list
        ;;
 s|se|sen|send)
-       send "$@"
+       sendfunktion "$@"
        ;;
-del|dele|delet)
+del|dele|delet|delete)
        [ $# -eq 0 ] || usage 1
        delete
        ;;
@@ -293,4 +289,7 @@ w|wh|who|whom)
 -V|-Ve|-Ver|-Vers|-Versi|-Versio|-Version)
        version $#
        ;;
+*)
+       usage 1
+       ;;
 esac