diff options
Diffstat (limited to 'usr/src/cmd/mailx/fio.c')
| -rw-r--r-- | usr/src/cmd/mailx/fio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/src/cmd/mailx/fio.c b/usr/src/cmd/mailx/fio.c index 818860d7ae..53907ca760 100644 --- a/usr/src/cmd/mailx/fio.c +++ b/usr/src/cmd/mailx/fio.c @@ -21,6 +21,10 @@ */ /* + * Copyright 2014 Joyent, Inc. + */ + +/* * Copyright 1999 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,8 +32,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "rcv.h" #include <locale.h> #include <wordexp.h> @@ -174,7 +176,7 @@ setptr(register FILE *ibuf) } /* Look for a From line that starts a new message */ - if (blankline && linebuf[0] == 'F' && ishead(linebuf)) { + if (blankline && linebuf[0] == 'F' && is_headline(linebuf)) { if (msgCount > 0 && !newmail) { message[msgCount-1].m_size = s; message[msgCount-1].m_lines = l; @@ -755,7 +757,7 @@ expand(char *name) if (debug) fprintf(stderr, "%s\n", name); return (name); } - if (wordexp(name, &wrdexp_buf, 0) != 0) { + if (wordexp(name, &wrdexp_buf, WRDE_NOCMD) != 0) { fprintf(stderr, gettext("Syntax error in \"%s\"\n"), name); fflush(stderr); return (NOSTR); |