Now takes -N flag to suppress initial header printing

[unix-history] / usr / src / usr.bin / mail / lex.c

diff --git a/usr/src/usr.bin/mail/lex.c b/usr/src/usr.bin/mail/lex.c
index d9b9c5d..f76c673 100644 (file)
--- a/usr/src/usr.bin/mail/lex.c
+++ b/usr/src/usr.bin/mail/lex.c
@@ -8,7 +8,7 @@
  * Lexical processing of commands.
  */
 
  * Lexical processing of commands.
  */
 

-static char *SccsId = "@(#)lex.c       1.12 %G%";
+static char *SccsId = "@(#)lex.c       1.14 %G%";

 
 /*
  * Set up editing on the given file name.
 
 /*
  * Set up editing on the given file name.


@@ -224,7 +224,7 @@ execute(linebuf, contxt)
                return(0);
        }
        cp2 = word;
                return(0);
        }
        cp2 = word;

-       while (*cp && !any(*cp, " \t0123456789$^./-+*'\""))
+       while (*cp && !any(*cp, " \t0123456789$^.:/-+*'\""))

                *cp2++ = *cp++;
        *cp2 = '\0';
 
                *cp2++ = *cp++;
        *cp2 = '\0';
 


@@ -504,7 +504,7 @@ announce(pr)
        if (pr && value("quiet") == NOSTR)
                printf(greeting, version);
        dot = &message[mdot - 1];
        if (pr && value("quiet") == NOSTR)
                printf(greeting, version);
        dot = &message[mdot - 1];

-       if (msgCount > 0)
+       if (msgCount > 0 && !noheader)

                headers(vec);
 }
 
                headers(vec);
 }