Improve POP SASL error handling

[nmh] / docs / contrib / replaliases

diff --git a/docs/contrib/replaliases b/docs/contrib/replaliases
index 796e7b2bbbef28d98284e46ac0b6beaaa3c6ffe3..425c362cfea831f4ef7d56bfb17ef39ef4d959db 100644 (file)
--- a/docs/contrib/replaliases
+++ b/docs/contrib/replaliases
@@ -19,6 +19,7 @@ if [ -z "$PARINIT" ]; then
     export PARINIT
 fi
 
+
 #### Reply, including text/html (converted to text/plain) and
 #### text/plain parts.
 ####
@@ -32,12 +33,12 @@ fi
 rt() {
     if [ "$1" = -h ]; then
         shift
-        repl -filter mhl.replywithoutbody -convertargs text/plain '' "$@"
+        \repl -filter mhl.replywithoutbody -convertargs text/plain '' "$@"
     elif [ "$1" = -p ]; then
         shift
-        repl -filter mhl.replywithoutbody -convertargs text/html '' "$@"
+        \repl -filter mhl.replywithoutbody -convertargs text/html '' "$@"
     else
-        repl -filter mhl.replywithoutbody \
+        \repl -filter mhl.replywithoutbody \
              -convertargs text/html '' -convertargs text/plain '' "$@"
     fi
 }
@@ -53,31 +54,82 @@ rt() {
 #### replace $EDITOR above with the name of your editor.  Without that
 #### profile entry, enter "e[dit] $EDITOR" at the What now? prompt.
 rtm() {
-    rt -editor mhbuild "$@"
+    rt "$@" -editor mhbuild
+}
+
+
+#### Internal function for use by calendar response functions below.
+#### Pulls "-a address" out of command line arguments.
+mhical_attendee() {
+    mhical_prev=
+    mhical_attendee=
+    for arg in "$@"; do
+        test "$mhical_prev" = -a  &&  mhical_attendee="$arg"
+        mhical_prev="$arg"
+    done
+    unset arg
+    unset mhical_prev
+    echo "$mhical_attendee"
 }
 
 
 #### accept a calendar request
+#### usage: calaccept [-a address] [repl switches]
+####   -a specifies attendee, see mhical(1)
+#### Other arguments passed to repl(1).
 calaccept() {
-    repl -noformat -editor mhbuild \
-         -convertargs text/calendar '-reply accept -contenttype' "$@"
+    if [ "$1" = -a ]; then
+        attendee=' -attendee '`mhical_attendee "$@"`
+        shift; shift
+    else
+        attendee=
+    fi
+    \repl -noformat -editor mhbuild \
+          -convertargs text/calendar "-reply accept -contenttype${attendee}" \
+          "$@"
+    unset attendee
 }
 
+
 #### decline a calendar request
+#### usage: caldecline [-a address] [repl switches]
+####   -a specifies attendee, see mhical(1)
+#### Other arguments passed to repl(1).
 caldecline() {
-    repl -noformat -editor mhbuild \
-         -convertargs text/calendar '-reply decline -contenttype' "$@"
+    if [ "$1" = -a ]; then
+        attendee=' -attendee '`mhical_attendee "$@"`
+        shift; shift
+    else
+        attendee=
+    fi
+    \repl -noformat -editor mhbuild \
+          -convertargs text/calendar "-reply decline -contenttype${attendee}" \
+          "$@"
+    unset attendee
 }
 
+
 #### reply as tentative to a calendar request
+#### usage: caltentative [-a address] [repl switches]
+####   -a specifies attendee, see mhical(1)
+#### Other arguments passed to repl(1).
 caltentative() {
-    repl -noformat -editor mhbuild \
-         -convertargs text/calendar '-reply tentative -contenttype' "$@"
+    if [ "$1" = -a ]; then
+        attendee=' -attendee '`mhical_attendee "$@"`
+        shift; shift
+    else
+        attendee=
+    fi
+    \repl -noformat -editor mhbuild \
+          -convertargs text/calendar "-reply tentative -contenttype${attendee}" \
+          "$@"
+    unset attendee
 }
 
+
 #### cancel a calendar request
 calcancel() {
-    repl -noformat -editor mhbuild \
+    \repl -noformat -editor mhbuild \
          -convertargs text/calendar '-cancel -contenttype' "$@"
 }