X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnow.c;h=63a60f3049c4e63e6337c39d930ea1be2f5893d5;hb=9fca5fd33b87291cdcb326c7aab6ab9574244289;hp=273921c9c24d7aae269d1315f0a0f41da97a639b;hpb=6b1eba7d43dcd9d28c0d4ac2bae23a55f487a9b8;p=mmh

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 273921c..63a60f3 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -41,7 +41,7 @@
 #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
@@ -58,31 +58,31 @@ static struct swit whatnowswitches[] = {
 */
 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 LISTSW  3
-	{ "list", 0 },
-#define SENDSW  4
-	{ "send [<switches>]", 0 },
-#define QUITSW  5
-	{ "quit", 0 },
-#define DELETESW  6
+#define SENDSW  3
+	{ "send", 0 },
+#define REFILEOPT  4
+	{ "refile +folder", 0 },
+#define DELETESW  5
 	{ "delete", 0 },
+#define QUITSW  6
+	{ "quit", 0 },
 #define CDCMDSW  7
 	{ "cd [directory]", 0 },
 #define PWDCMDSW  8
 	{ "pwd", 0 },
 #define LSCMDSW  9
 	{ "ls", 0 },
-#define ATTACHCMDSW  10
-	{ "attach", 0 },
-#define DETACHCMDSW  11
-	{ "detach", 0 },
-#define ALISTCMDSW  12
+#define ALISTCMDSW  10
 	{ "alist", 0 },
+#define ATTACHCMDSW  11
+	{ "attach files", 0 },
+#define DETACHCMDSW  12
+	{ "detach numbers", 0 },
 	{ NULL, 0 }
 };
 
@@ -134,9 +134,9 @@ main(int argc, char **argv)
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch(++cp, whatnowswitches)) {
+			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
-				ambigsw(cp, whatnowswitches);
+				ambigsw(cp, switches);
 				done(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
@@ -145,7 +145,7 @@ main(int argc, char **argv)
 				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);
@@ -609,7 +609,7 @@ sendfile(char **arg, char *file)
 		/* fall */
 	case OK:
 		vecp = 0;
-		vec[vecp++] = invo_name;
+		vec[vecp++] = "send";
 		if (arg)
 			while (*arg)
 				vec[vecp++] = *arg++;