Allow -clobber with mhstore -outfile.

diff --git a/man/mhstore.man b/man/mhstore.man
index d39994ef933871f03d506fa2d7afa710985e425b..f205482a7ade0fc3ccef5c6919fa596405cc2674 100644 (file)
--- a/man/mhstore.man
+++ b/man/mhstore.man
@@ -157,8 +157,8 @@ the current working directory is used.
 .PP
 If the
 .B \-outfile
 .PP
 If the
 .B \-outfile

-switch is given, its argument is used for the filename to store the
-content, with \*(lq-\*(rq indicating standard output.  If the
+switch is given, its argument is used for the filename to store all
+of the content, with \*(lq-\*(rq indicating standard output.  If the

 .B \-auto
 switch is given, then
 .B mhstore
 .B \-auto
 switch is given, then
 .B mhstore


@@ -341,12 +341,6 @@ terminal,
 .I ask
 behaves the same as
 .IR always .
 .I ask
 behaves the same as
 .IR always .

-.PP
-The
-.B \-clobber
-switch is ignored if the
-.B \-outfile
-switch is used.

 .SS "Reassembling Messages of Type message/partial"
 .B mhstore
 is also able to reassemble messages that have been
 .SS "Reassembling Messages of Type message/partial"
 .B mhstore
 is also able to reassemble messages that have been

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index fab168001004c5716260d47304cf04cb042b91a1..9efc732cf848888f7815fa9140e0df894df89662 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -607,7 +607,13 @@ store_content (CT ct, CT p)
        if ((ct->c_storage = clobber_check (add (buffer, NULL))) == NULL) {
            return NOTOK;
        }
        if ((ct->c_storage = clobber_check (add (buffer, NULL))) == NULL) {
            return NOTOK;
        }

-    } /* else output filename was explicitly specified, so use it */
+    } else {
+        /* The output filename was explicitly specified, so use it. */
+       if ((ct->c_storage = clobber_check (add (ct->c_storage, NULL))) ==
+            NULL) {
+           return NOTOK;
+       }
+    }

 
 got_filename:
     /* flush the output stream */
 
 got_filename:
     /* flush the output stream */