Made show(1) the default lproc. `list' and `display' changed a bit.

[mmh] / uip / whatnow.c

diff --git a/uip/whatnow.c b/uip/whatnow.c
index b081900..afe4129 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -66,9 +66,9 @@ static struct swit aleqs[] = {
 #define REFILEOPT  1
        { "refile [<switches>] +folder", 0 },
 #define DISPSW  2
-       { "display [<switches>]", 0 },
+       { "display", 0 },
 #define LISTSW  3
-       { "list [<switches>]", 0 },
+       { "list", 0 },
 #define SENDSW  4
        { "send [<switches>]", 0 },
 #define PUSHSW  5
@@ -218,10 +218,13 @@ main(int argc, char **argv)
                switch (smatch(*argp, aleqs)) {
                case DISPSW:
                        /* display the msg being replied to or distributed */
-                       if (msgnam)
-                               showfile(++argp, msgnam);
-                       else
+                       if (msgnam) {
+                               snprintf(buf, sizeof buf, "%s '%s'",
+                                               lproc, msgnam);
+                               system(buf);
+                       } else {
                                advise(NULL, "no alternate message to display");
+                       }
                        break;
 
                case EDITSW:
@@ -235,7 +238,8 @@ main(int argc, char **argv)
 
                case LISTSW:
                        /* display the draft file */
-                       showfile(++argp, drft);
+                       snprintf(buf, sizeof buf, "%s '%s'", lproc, drft);
+                       system(buf);
                        break;
 
                case QUITSW:
@@ -383,13 +387,13 @@ main(int argc, char **argv)
 
                                        if (*shell == '/')
                                                annotate(drft, attach_hdr,
-                                                               shell, 1, 0,
+                                                               shell, 0,
                                                                -2, 1);
                                        else {
                                                sprintf(file, "%s/%s", cwd,
                                                                shell);
                                                annotate(drft, attach_hdr,
-                                                               file, 1, 0,
+                                                               file, 0,
                                                                -2, 1);
                                        }
                                }
@@ -437,7 +441,7 @@ main(int argc, char **argv)
                                        if (**arguments != '\0') {
                                                n = atoi(*arguments);
                                                annotate(drft, attach_hdr,
-                                                               NULL, 1, 0,
+                                                               NULL, 0,
                                                                n, 1);
 
                                                for (argp = arguments + 1; *argp != NULL; argp++) {
@@ -470,7 +474,7 @@ main(int argc, char **argv)
                                                != NULL) {
                                        *(strchr(shell, '\n')) = '\0';
                                        annotate(drft, attach_hdr, shell,
-                                                       1, 0, 0, 1);
+                                                       0, 0, 1);
                                }
                                pclose(f);
                        } else {