whatnow: Re-integrated whom(1); cleanups.

Removed reference to `send -watch', which was removed in
9677896bbb11f7b49ca3e1665601407b6c7a459f
Reordered the options.

diff --git a/man/whatnow.man1 b/man/whatnow.man1
index 54f0ef8..e13fbfd 100644 (file)
--- a/man/whatnow.man1
+++ b/man/whatnow.man1
@@ -48,28 +48,27 @@ preceding round unless a profile entry
 .B edit <editor>
 invoke <editor> for further editing
 .TP \w'refilezzzzfolderz'u
-.B refile +folder
-refile the draft into the given folder
+.B list
+list the draft on the terminal
 .TP \w'refilezzzzfolderz'u
 .B display
-list the message being distributed/replied\-to
-on the terminal
+list the message being distributed/replied\-to on the terminal
 .TP \w'refilezzzzfolderz'u
-.B list
-list the draft on the terminal
+.B whom
+list the recipients of the message
 .TP \w'refilezzzzfolderz'u
 .B send
 send the message
 .TP \w'refilezzzzfolderz'u
-.B send \-watch
-send the message and monitor the delivery process
-.TP \w'refilezzzzfolderz'u
-.B quit
-preserve the draft and exit
+.B refile +folder
+refile the draft into the given folder
 .TP \w'refilezzzzfolderz'u
 .B delete
 delete the draft and exit
 .TP \w'refilezzzzfolderz'u
+.B quit
+preserve the draft and exit
+.TP \w'refilezzzzfolderz'u
 .B cd directory
 use the directory when interpreting attachment file names
 .TP \w'refilezzzzfolderz'u

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 63a60f3..6cb96f7 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -63,25 +63,27 @@ static struct swit aleqs[] = {
        { "list", 0 },
 #define DISPSW  2
        { "display", 0 },
-#define SENDSW  3
+#define WHOMSW  3
+       { "whom", 0 },
+#define SENDSW  4
        { "send", 0 },
-#define REFILEOPT  4
+#define REFILEOPT  5
        { "refile +folder", 0 },
-#define DELETESW  5
+#define DELETESW  6
        { "delete", 0 },
-#define QUITSW  6
+#define QUITSW  7
        { "quit", 0 },
-#define CDCMDSW  7
+#define CDCMDSW  8
        { "cd [directory]", 0 },
-#define PWDCMDSW  8
+#define PWDCMDSW  9
        { "pwd", 0 },
-#define LSCMDSW  9
+#define LSCMDSW  10
        { "ls", 0 },
-#define ALISTCMDSW  10
+#define ALISTCMDSW  11
        { "alist", 0 },
-#define ATTACHCMDSW  11
+#define ATTACHCMDSW  12
        { "attach files", 0 },
-#define DETACHCMDSW  12
+#define DETACHCMDSW  13
        { "detach numbers", 0 },
        { NULL, 0 }
 };
@@ -399,6 +401,12 @@ main(int argc, char **argv)
                        }
                        break;
 
+               case WHOMSW:
+                       /* list recipients */
+                       snprintf(buf, sizeof buf, "%s '%s'", "whom", drft);
+                       system(buf);
+                       break;
+
                default:
                        /* Unknown command */
                        advise(NULL, "say what?");