From e8283fa6b12ff7521ea6715fab21e72c2caf135c Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 10 Jan 2015 17:16:01 +0000
Subject: [PATCH] fix wordexp result handling

---
 usr.bin/mail/names.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index b0c6ee688a62..d1a6f3d752b5 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: names.c,v 1.31 2014/12/16 19:30:24 christos Exp $	*/
+/*	$NetBSD: names.c,v 1.32 2015/01/10 17:16:01 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: names.c,v 1.31 2014/12/16 19:30:24 christos Exp $");
+__RCSID("$NetBSD: names.c,v 1.32 2015/01/10 17:16:01 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -550,7 +550,7 @@ unpack(struct name *smopts, struct name *np)
 	 * the terminating 0 pointer.  Additional spots may be needed
 	 * to pass along -f to the host mailer.
 	 */
-	extra = 3 * count(smopts);
+	extra = 3 + count(smopts);
 	extra++;
 	metoo = value(ENAME_METOO) != NULL;
 	if (metoo)