 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmd3.c,v 1.42 2012/04/29 23:50:22 christos Exp $	*/
+/*	$NetBSD: cmd3.c,v 1.42.10.1 2015/04/23 19:46:40 snj Exp $	*/
 /*
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cmd3.c	8.2 (Berkeley) 4/20/95";
 #else
-__RCSID("$NetBSD: cmd3.c,v 1.42 2012/04/29 23:50:22 christos Exp $");
+__RCSID("$NetBSD: cmd3.c,v 1.42.10.1 2015/04/23 19:46:40 snj Exp $");
 #endif
 #endif /* not lint */
 #include "rcv.h"
 #include <assert.h>
 #include <util.h>
 #include "extern.h"
 #include "mime.h"
 #include "sig.h"
 #include "thread.h"
 /*
  * Mail -- a mail program
 @@ -567,27 +567,27 @@ bounce(void *v)
 		/* setup the bounce tab */
 		add_ignore("Status", bouncetab);
 		add_ignore("Delivered-To", bouncetab);
 		add_ignore("To", bouncetab);
 		add_ignore("X-Original-To", bouncetab);
+	}
 	(void)memset(&hdr, 0, sizeof(hdr));
 	if ((rval = grabh(&hdr, GTO)) != 0)
 		return rval;
 	if (hdr.h_to == NULL)
 		return 1;
-	smargs = unpack(hdr.h_to);
+	smargs = unpack(NULL, hdr.h_to);
 	for (ip = msgvec; *ip; ip++) {
 		int e;
 		if ((e = bounce_one(*ip, smargs, hdr.h_to)) != 0)
 			return e;
+	}
 	return 0;
+}
 /*
  * Preserve the named messages, so that they will be sent
  * back to the system mailbox.
  */
 PUBLIC int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: extern.h,v 1.32 2012/02/28 22:30:44 joerg Exp $	*/
+/*	$NetBSD: extern.h,v 1.32.10.1 2015/04/23 19:46:40 snj Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95
- *	$NetBSD: extern.h,v 1.32 2012/02/28 22:30:44 joerg Exp $
+ *	$NetBSD: extern.h,v 1.32.10.1 2015/04/23 19:46:40 snj Exp $
  */
 #ifndef __EXTERN_H__
 #define __EXTERN_H__
 /*
  * from cmd1.c
  */
 int	More(void *);
 int	Type(void *);
 int	folders(void *);
 int	from(void *);
 int	headers(void *);
 @@ -214,27 +214,27 @@ int	main(int, char **);
 /*
  * from names.c
  */
 struct name *cat(struct name *, struct name *);
 int	count(struct name *);
 struct name *delname(struct name *, char []);
 char *	detract(struct name *, int);
 struct name * elide(struct name *);
 struct name * extract(char [], int);
 struct name * gexpand(struct name *, struct grouphead *, int, int);
 struct name * nalloc(char [], int);
 struct name * outof(struct name *, FILE *, struct header *);
-const char ** unpack(struct name *);
+const char ** unpack(struct name *, struct name *);
 struct name * usermap(struct name *);
 #if 0
 void	prettyprint(struct name *);	/* commented out? */
 #endif
 /*
  * from popen.c
  */
 int	Fclose(FILE *);
 FILE *	Fdopen(int, const char *);
 FILE *	Fopen(const char *, const char *);
 int	Pclose(FILE *);
 FILE *	Popen(const char *, const char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fio.c,v 1.40 2013/03/09 19:43:07 christos Exp $	*/
+/*	$NetBSD: fio.c,v 1.40.8.1 2015/04/23 19:46:40 snj Exp $	*/
 /*
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,34 +24,35 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)fio.c	8.2 (Berkeley) 4/20/95";
 #else
-__RCSID("$NetBSD: fio.c,v 1.40 2013/03/09 19:43:07 christos Exp $");
+__RCSID("$NetBSD: fio.c,v 1.40.8.1 2015/04/23 19:46:40 snj Exp $");
 #endif
 #endif /* not lint */
 #include "rcv.h"
 #include "extern.h"
 #include "thread.h"
 #include "sig.h"
 #include <wordexp.h>
 /*
  * Mail -- a mail program
+ *
  * File I/O.
  */
 #ifndef THREAD_SUPPORT
 /************************************************************************/
 /*
  * If we have threading support, these routines live in thread.c.
  */
 static struct message *message;		/* message structure array */
 @@ -414,33 +415,30 @@ getfold(char *name, size_t namesize)
  * Supported meta characters:
  *	%	for my system mail box
  *	%user	for user's system mail box
  *	#	for previous file
  *	&	invoker's mbox file
  *	+file	file in folder directory
  *	any shell meta character
  * Return the file name as a dynamic string.
  */
 PUBLIC const char *
 expand(const char *name)
+{
 	char xname[PATHSIZE];
-	char cmdbuf[PATHSIZE];		/* also used for file names */
+	char cmdbuf[PATHSIZE];
-	pid_t pid;
+	int e;
-	ssize_t l;
+	wordexp_t we;
-	char *cp;
+	sigset_t nset, oset;
 	const char *shellcmd;
 	int pivec[2];
 	struct stat sbuf;
 	/*
 	 * The order of evaluation is "%" and "#" expand into constants.
 	 * "&" can expand into "+".  "+" can expand into shell meta characters.
 	 * Shell meta characters expand into constants.
 	 * This way, we make no recursive expansion.
 	 */
 	switch (*name) {
 	case '%':
 		findmail(name[1] ? name + 1 : myname, xname, sizeof(xname));
 		return savestr(xname);
 	case '#':
 		if (name[1] != 0)
 @@ -456,67 +454,74 @@ expand(const char *name)
 		/* fall through */
+	}
 	if (name[0] == '+' && getfold(cmdbuf, sizeof(cmdbuf)) >= 0) {
 		(void)snprintf(xname, sizeof(xname), "%s/%s", cmdbuf, name + 1);
 		name = savestr(xname);
+	}
 	/* catch the most common shell meta character */
 	if (name[0] == '~' && (name[1] == '/' || name[1] == '\0')) {
 		(void)snprintf(xname, sizeof(xname), "%s%s", homedir, name + 1);
 		name = savestr(xname);
+	}
 	if (strpbrk(name, "~{[*?$`'\"\\") == NULL)
 		return name;
 	if (pipe(pivec) < 0) {
-		warn("pipe");
+	*xname = '\0';
 		return name;
 	sigemptyset(&nset);
-	(void)snprintf(cmdbuf, sizeof(cmdbuf), "echo %s", name);
+	sigaddset(&nset, SIGCHLD);
-	if ((shellcmd = value(ENAME_SHELL)) == NULL)
+	sigprocmask(SIG_BLOCK, &nset, &oset);
-		shellcmd = _PATH_CSHELL;
+	e = wordexp(name, &we, WRDE_NOCMD);
-	pid = start_command(shellcmd, NULL, -1, pivec[1], "-c", cmdbuf, NULL);
+	sigprocmask(SIG_SETMASK, &oset, NULL);
 	if (pid < 0) {
-		(void)close(pivec[0]);
+	switch (e) {
-		(void)close(pivec[1]);
+	case 0: /* OK */
 		break;
 	case WRDE_NOSPACE:
 		warnx("Out of memory expanding `%s'", name);
 		return NULL;
 	case WRDE_BADVAL:
-	(void)close(pivec[1]);
+	case WRDE_BADCHAR:
-	l = read(pivec[0], xname, sizeof(xname));
+	case WRDE_SYNTAX:
-	(void)close(pivec[0]);
+		warnx("Syntax error expanding `%s'", name);
 	if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
 		warnx("Expansion `%s' failed [%x]", cmdbuf, wait_status);
 		return NULL;
 	case WRDE_CMDSUB:
-	if (l < 0) {
+		warnx("Command substitution not allowed expanding `%s'",
-		warn("read");
+		    name);
 		return NULL;
 	default:
-	if (l == 0) {
+		warnx("Unknown expansion error %d expanding `%s'", e, name);
 		warnx("No match for `%s'", name);
 		return NULL;
+	}
 	if (l == sizeof(xname)) {
-		warnx("Expansion buffer overflow for `%s'", name);
+	switch (we.we_wordc) {
-		return NULL;
+	case 0:
 		warnx("No match for `%s'", name);
-	xname[l] = '\0';
+		break;
-	for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
+	case 1:
-		continue;
+		if (strlen(we.we_wordv[0]) >= PATHSIZE)
-	cp[1] = '\0';
+			warnx("Expansion too long for `%s'", name);
-	if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
+		strlcpy(xname, we.we_wordv[0], PATHSIZE);
 		break;
 	default:
 		warnx("Ambiguous expansion for `%s'", name);
-		return NULL;
+		break;
+	}
 	return savestr(xname);
 	wordfree(&we);
 	if (!*xname)
 		return NULL;
 	else
 		return savestr(xname);
+}
 /*
  * Return the name of the dead.letter file.
  */
 PUBLIC const char *
 getdeadletter(void)
+{
 	const char *cp;
 	if ((cp = value(ENAME_DEAD)) == NULL || (cp = expand(cp)) == NULL)
 		cp = expand("~/dead.letter");
 	else if (*cp != '/') {

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: mail.1,v 1.60 2013/03/09 19:43:20 christos Exp $
+.\"	$NetBSD: mail.1,v 1.60.8.1 2015/04/23 19:46:40 snj Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.8 (Berkeley) 4/28/95
 .\"
-.Dd March 9, 2013
+.Dd December 15, 2014
 .Dt MAIL 1
 .Os
 .Sh NAME
 .Nm mail ,
 .Nm mailx ,
 .Nm Mail
 .Nd send and receive mail
 .Sh SYNOPSIS
 .Nm
 .Op Fl EIinv
 .Op Fl a Ar file
 .Op Fl b Ar bcc-addr
 .Op Fl c Ar cc-addr
 @@ -715,26 +715,30 @@ Terminate an
 or
 .Ic ifndef
 command.
 .It Ic exit
 .Po Ic ex
 or
 .Ic x
 .Pc
 Effects an immediate return to the Shell without
 modifying the user's system mailbox, his
 .Ar mbox
 file, or his edit file in
 .Fl f .
 .It Ic expandaddr
 If unset (the default), recipient addresses must be names of local mailboxes
 or Internet mail addresses.
 If set, shell expansion of existing mailbox names will be performed.
 .It Ic expose
 Expose the thread structure so all messages appear in header listings.
 (See
 .Ar hide
 for the inverse.)
 The default header prompt will indent each header line one space for
 each level in the threading.
 The
 .Dq Li "%?* ?"
 format string does this.
 .It Ic file
 .Pq Ic fi
 The same as

 @@ -1,14 +1,14 @@
-/*	$NetBSD: names.c,v 1.30 2012/10/21 01:11:23 christos Exp $	*/
+/*	$NetBSD: names.c,v 1.30.8.1 2015/04/23 19:46:40 snj Exp $	*/
 /*
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: names.c,v 1.30 2012/10/21 01:11:23 christos Exp $");
+__RCSID("$NetBSD: names.c,v 1.30.8.1 2015/04/23 19:46:40 snj Exp $");
 #endif
 #endif /* not lint */
 /*
  * Mail -- a mail program
+ *
  * Handle name lists.
  */
 #include "rcv.h"
 #include "extern.h"
 /*
 @@ -244,26 +244,29 @@ isfileaddr(char *name)
  */
 PUBLIC struct name *
 outof(struct name *names, FILE *fo, struct header *hp)
+{
 	int c, fd;
 	struct name *np, *begin;
 	time_t now;
 	char *date;
 	const char *fname;
 	FILE *fout, *fin;
 	int ispipe;
 	char tempname[PATHSIZE];
 	if (value("expandaddr") == NULL)
 		return names;
 	begin = names;
 	np = names;
 	(void)time(&now);
 	date = ctime(&now);
 	while (np != NULL) {
 		if (!isfileaddr(np->n_name) && np->n_name[0] != '|') {
 			np = np->n_flink;
 			continue;
+		}
 		ispipe = np->n_name[0] == '|';
 		if (ispipe)
 			fname = np->n_name+1;
 		else {
 @@ -522,57 +525,61 @@ count(struct name *np)
 	int c;
 	for (c = 0; np != NULL; np = np->n_flink)
 		if ((np->n_type & GDEL) == 0)
 			c++;
 	return c;
+}
 /*
  * Unpack the name list onto a vector of strings.
  * Return an error if the name list won't fit.
  */
 PUBLIC const char **
-unpack(struct name *np)
+unpack(struct name *smopts, struct name *np)
+{
 	const char **ap, **begin;
 	struct name *n;
 	int t, extra, metoo, verbose;
 	n = np;
 	if ((t = count(n)) == 0)
 		errx(EXIT_FAILURE, "No names to unpack");
 	/*
 	 * Compute the number of extra arguments we will need.
 	 * We need at least two extra -- one for "mail" and one for
 	 * the terminating 0 pointer.  Additional spots may be needed
 	 * to pass along -f to the host mailer.
 	 */
-	extra = 2;
+	extra = 3 + count(smopts);
 	extra++;
 	metoo = value(ENAME_METOO) != NULL;
 	if (metoo)
 		extra++;
 	verbose = value(ENAME_VERBOSE) != NULL;
 	if (verbose)
 		extra++;
 	begin = salloc((t + extra) * sizeof(*begin));
 	ap = begin;
 	*ap++ = "sendmail";
 	*ap++ = "-i";
 	if (metoo)
 		*ap++ = "-m";
 	if (verbose)
 		*ap++ = "-v";
 	for (/*EMPTY*/; smopts != NULL; smopts = smopts->n_flink)
 		if ((smopts->n_type & GDEL) == 0)
 			*ap++ = smopts->n_name;
 	*ap++ = "--";
 	for (/*EMPTY*/; n != NULL; n = n->n_flink)
 		if ((n->n_type & GDEL) == 0)
 			*ap++ = n->n_name;
 	*ap = NULL;
 	return begin;
+}
 /*
  * Remove all of the duplicates from the passed name list by
  * insertion sorting them, then checking for dups.
  * Return the head of the new list.
  */
 PUBLIC struct name *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: send.c,v 1.37 2012/04/29 23:50:22 christos Exp $	*/
+/*	$NetBSD: send.c,v 1.37.10.1 2015/04/23 19:46:40 snj Exp $	*/
 /*
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)send.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: send.c,v 1.37 2012/04/29 23:50:22 christos Exp $");
+__RCSID("$NetBSD: send.c,v 1.37.10.1 2015/04/23 19:46:40 snj Exp $");
 #endif
 #endif /* not lint */
 #include <assert.h>
 #include "rcv.h"
 #include "extern.h"
 #ifdef MIME_SUPPORT
 #include "mime.h"
 #endif
 #include "sig.h"
 /*
 @@ -751,27 +751,27 @@ mail1(struct header *hp, int printheader
 		return;
+	}
 	if (hp->h_smopts == NULL) {
 		hp->h_smopts = get_smopts(to);
 		if (hp->h_smopts != NULL &&
 		    hp->h_smopts->n_name[0] != '\0' &&
 		    value(ENAME_SMOPTS_VERIFY) != NULL)
 			if (grabh(hp, GSMOPTS)) {
 				(void)printf("mail aborted!\n");
 				savedeadletter(mtf);
 				goto out;
+			}
+	}
-	namelist = unpack(cat(hp->h_smopts, to));
+	namelist = unpack(hp->h_smopts, to);
 	mail2(mtf, namelist);
  out:
 	(void)Fclose(mtf);
+}
 /*
  * Interface between the argument list and the mail1 routine
  * which does all the dirty work.
  */
 PUBLIC int
 mail(struct name *to, struct name *cc, struct name *bcc,
      struct name *smopts, char *subject, struct attachment *attach)
+{