Added -nocontentid (and -contentid, for symmetry) switch to mhbuild. This allows...

[mmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 53320d3..d863b5b 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -44,6 +44,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <h/mime.h>
+#include <h/utils.h>
 
 static struct swit whatnowswitches[] = {
 #define        DFOLDSW                 0
@@ -447,10 +448,10 @@ WhatNow (int argc, char **argv)
                    *(strchr(shell, '\n')) = '\0';
 
                    if (*shell == '/')
-                       (void)annotate(drft, attach, shell, 1, 0, -1, 1);
+                       (void)annotate(drft, attach, shell, 1, 0, -2, 1);
                    else {
                        (void)sprintf(file, "%s/%s", cwd, shell);
-                       (void)annotate(drft, attach, file, 1, 0, -1, 1);
+                       (void)annotate(drft, attach, file, 1, 0, -2, 1);
                    }
                }
 
@@ -843,8 +844,7 @@ buildfile (char **argp, char *file)
        while (argp[i])
            i++;
     }
-    if ((args = (char **) malloc((i + 2) * sizeof(char *))) == NULL)
-       adios (NULL, "unable to malloc memory");
+    args = (char **) mh_xmalloc((i + 2) * sizeof(char *));
 
     /*
      * For backward compatibility, we need to add -build