Replace getcpy(f()) calls with mh_xstrdup() when f() can't be NULL.

[nmh] / sbr / error.c

diff --git a/sbr/error.c b/sbr/error.c
index 96c89f5812ce92b003803cb835ea05f14d354c61..828505103c105a222dd851ff1ae3b4eeac58f488 100644 (file)
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -9,7 +9,7 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
-
+#include "h/done.h"
 
 /* inform calls advertise() with no what and no tail.
  * Thus the simple "[invo_name: ]fmt\n" results. */
@@ -58,6 +58,21 @@ adios (const char *what, const char *fmt, ...)
 }
 
 
+/* die is the same as adios(), but without the what as that's commonly
+ * NULL. */
+void NORETURN
+die(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    advertise(NULL, NULL, fmt, ap);
+    va_end(ap);
+    done(1);
+    abort();
+}
+
+
 /* admonish calls advertise() with a tail indicating the program
  * continues.
  * Thus "[invo_name: ]fmt[[ what]: errno], continuing...\n" results. */