Added svector_find() function.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 03f3e054ab1b05b244c46d567c675fca331d8d1c..d41413898e3cc23fcab13e9f4bcfbd2878b5734b 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -26,8 +26,9 @@
  *                             pwd command and exists to allow the user
  *                             to verify the directory.
  *
- *     attach files            This option attaches the named files to
- *                             the draft.
+ *     attach [-v] files       This option attaches the named files to
+ *                             the draft.  -v displays the mhbuild
+ *                             directive that send(1) will use.
  *
  *     alist [-ln]             This option lists the attachments on the
  *                             draft.  -l gets long listings, -n gets
@@ -80,8 +81,8 @@ DEFINE_SWITCH_ARRAY(WHATNOW, whatnowswitches);
     X("cd [directory]", 0, CDCMDSW) \
     X("pwd", 0, PWDCMDSW) \
     X("ls", 2, LSCMDSW) \
-    X("attach", 0, ATTACHCMDSW) \
-    X("detach [-n]", 2, DETACHCMDSW) \
+    X("attach [-v]", 0, ATTACHCMDSW) \
+    X("detach [-n]", 0, DETACHCMDSW) \
     X("alist [-ln] ", 2, ALISTCMDSW) \
 
 #define X(sw, minchars, id) id,
@@ -393,18 +394,30 @@ WhatNow (int argc, char **argv)
 
            break;
 
-       case ATTACHCMDSW:
+       case ATTACHCMDSW: {
            /*
             *  Attach files to current draft.
             */
 
+            int verbose = 0;
+            char **ap;
+
            if (attach == (char *)0) {
                advise((char *)0, "can't attach because no header field name was given.");
                break;
            }
 
+           for (ap = argp+1; *ap; ++ap) {
+               if (strcmp(*ap, "-v") == 0) {
+                   ++argp;
+                   verbose = 1;
+               } else if (*ap[0] != '-') {
+                   break;
+               }
+           }
+
            if (*(argp+1) == (char *)0) {
-               advise((char *)0, "attach command requires file argument(s).");
+               advise(NULL, "attach command requires file argument(s).");
                break;
            }
 
@@ -424,13 +437,28 @@ WhatNow (int argc, char **argv)
 
            if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
                while (fgets(shell, sizeof (shell), f) != (char *)0) {
+                   char *build_directive;
+
                    *(strchr(shell, '\n')) = '\0';
 
-                   if (*shell == '/')
+                   if (*shell == '/') {
                        (void)annotate(drft, attach, shell, 1, 0, -2, 1);
-                   else {
+                       if (verbose) {
+                           build_directive =
+                               construct_build_directive (shell, NULL, 1);
+                       }
+                   } else {
                        (void)sprintf(file, "%s/%s", cwd, shell);
                        (void)annotate(drft, attach, file, 1, 0, -2, 1);
+                       if (verbose) {
+                           build_directive =
+                               construct_build_directive (file, NULL, 1);
+                       }
+                   }
+
+                   if (verbose) {
+                       printf ("%s", build_directive);
+                       free (build_directive);
                    }
                }
 
@@ -441,7 +469,7 @@ WhatNow (int argc, char **argv)
            }
 
            break;
-
+       }
        case DETACHCMDSW:
            /*
             *  Detach files from current draft.
@@ -999,7 +1027,7 @@ check_draft (char *msgnam)
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
-    X("attach file", 6, SNDATTACHSW) \
+    X("attach fieldname", 6, SNDATTACHSW) \
     X("noattach", 0, SNDNOATTACHSW) \
     X("attachformat", 7, SNDATTACHFORMAT) \
     X("port server-port-name/number", 4, PORTSW) \
@@ -1276,7 +1304,11 @@ sendit (char *sp, char **arg, char *file, int pushed)
 #endif /* not lint */
            && altmsg) {
        vec[vecp++] = "-dist";
-       distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
+       if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+       distfile = getcpy (cp);
        unlink(distfile);
        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);