projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whatnow: Re-integrated whom(1); cleanups.
[mmh]
/
uip
/
whatnow.c
diff --git
a/uip/whatnow.c
b/uip/whatnow.c
index
273921c
..
6cb96f7
100644
(file)
--- a/
uip/whatnow.c
+++ b/
uip/whatnow.c
@@
-41,7
+41,7
@@
#include <h/mime.h>
#include <h/utils.h>
#include <h/mime.h>
#include <h/utils.h>
-static struct swit whatnowswitches[] = {
+static struct swit switches[] = {
#define EDITRSW 0
{ "editor editor", 0 },
#define PRMPTSW 1
#define EDITRSW 0
{ "editor editor", 0 },
#define PRMPTSW 1
@@
-58,31
+58,33
@@
static struct swit whatnowswitches[] = {
*/
static struct swit aleqs[] = {
#define EDITSW 0
*/
static struct swit aleqs[] = {
#define EDITSW 0
- { "edit [<editor> <switches>]", 0 },
-#define REFILEOPT 1
- { "refile [<switches>] +folder", 0 },
+ { "edit [editor [switches]]", 0 },
+#define LISTSW 1
+ { "list", 0 },
#define DISPSW 2
{ "display", 0 },
#define DISPSW 2
{ "display", 0 },
-#define LISTSW 3
- { "list", 0 },
+#define WHOMSW 3
+ { "whom", 0 },
#define SENDSW 4
#define SENDSW 4
- { "send [<switches>]", 0 },
-#define QUITSW 5
- { "quit", 0 },
+ { "send", 0 },
+#define REFILEOPT 5
+ { "refile +folder", 0 },
#define DELETESW 6
{ "delete", 0 },
#define DELETESW 6
{ "delete", 0 },
-#define CDCMDSW 7
+#define QUITSW 7
+ { "quit", 0 },
+#define CDCMDSW 8
{ "cd [directory]", 0 },
{ "cd [directory]", 0 },
-#define PWDCMDSW 8
+#define PWDCMDSW 9
{ "pwd", 0 },
{ "pwd", 0 },
-#define LSCMDSW 9
+#define LSCMDSW 10
{ "ls", 0 },
{ "ls", 0 },
-#define ATTACHCMDSW 10
- { "attach", 0 },
-#define DETACHCMDSW 11
- { "detach", 0 },
-#define ALISTCMDSW 12
+#define ALISTCMDSW 11
{ "alist", 0 },
{ "alist", 0 },
+#define ATTACHCMDSW 12
+ { "attach files", 0 },
+#define DETACHCMDSW 13
+ { "detach numbers", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-134,9
+136,9
@@
main(int argc, char **argv)
while ((cp = *argp++)) {
if (*cp == '-') {
while ((cp = *argp++)) {
if (*cp == '-') {
- switch (smatch(++cp, whatnowswitches)) {
+ switch (smatch(++cp, switches)) {
case AMBIGSW:
case AMBIGSW:
- ambigsw(cp, whatnowswitches);
+ ambigsw(cp, switches);
done(1);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
done(1);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
@@
-145,7
+147,7
@@
main(int argc, char **argv)
snprintf(buf, sizeof(buf),
"%s [switches] [file]",
invo_name);
snprintf(buf, sizeof(buf),
"%s [switches] [file]",
invo_name);
- print_help(buf, whatnowswitches, 1);
+ print_help(buf, switches, 1);
done(1);
case VERSIONSW:
print_version(invo_name);
done(1);
case VERSIONSW:
print_version(invo_name);
@@
-399,6
+401,12
@@
main(int argc, char **argv)
}
break;
}
break;
+ case WHOMSW:
+ /* list recipients */
+ snprintf(buf, sizeof buf, "%s '%s'", "whom", drft);
+ system(buf);
+ break;
+
default:
/* Unknown command */
advise(NULL, "say what?");
default:
/* Unknown command */
advise(NULL, "say what?");
@@
-609,7
+617,7
@@
sendfile(char **arg, char *file)
/* fall */
case OK:
vecp = 0;
/* fall */
case OK:
vecp = 0;
- vec[vecp++] = invo_name;
+ vec[vecp++] = "send";
if (arg)
while (*arg)
vec[vecp++] = *arg++;
if (arg)
while (*arg)
vec[vecp++] = *arg++;