changes per kurt

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

diff --git a/usr/src/usr.bin/mail/cmd1.c b/usr/src/usr.bin/mail/cmd1.c
index 733e892..1b7669e 100644 (file)
--- a/usr/src/usr.bin/mail/cmd1.c
+++ b/usr/src/usr.bin/mail/cmd1.c
@@ -8,7 +8,7 @@
  * User commands.
  */
 
  * User commands.
  */
 

-static char *SccsId = "@(#)cmd1.c      2.2.1.1 %G%";
+static char *SccsId = "@(#)cmd1.c      2.9 %G%";

 
 /*
  * Print the current active headings.
 
 /*
  * Print the current active headings.


@@ -181,7 +181,7 @@ printhead(mesg)
        if (mp->m_flag & MBOX)
                dispc = 'M';
        parse(headline, &hl, pbuf);
        if (mp->m_flag & MBOX)
                dispc = 'M';
        parse(headline, &hl, pbuf);

-       sprintf(wcount, " %d/%d", mp->m_lines, mp->m_size);
+       sprintf(wcount, " %d/%ld", mp->m_lines, mp->m_size);

        s = strlen(wcount);
        cp = wcount + s;
        while (s < 7)
        s = strlen(wcount);
        cp = wcount + s;
        while (s < 7)


@@ -231,12 +231,31 @@ pcmdlist()
 }
 
 /*
 }
 
 /*

- * Type out the messages requested.
+ * Type out messages, honor ignored fields.

  */
  */

+type(msgvec)
+       int *msgvec;
+{

 
 

+       return(type1(msgvec, 1));
+}
+
+/*
+ * Type out messages, even printing ignored fields.
+ */
+Type(msgvec)
+       int *msgvec;
+{
+
+       return(type1(msgvec, 0));
+}
+
+/*
+ * Type out the messages requested.
+ */

 jmp_buf        pipestop;
 
 jmp_buf        pipestop;
 

-type(msgvec)
+type1(msgvec, doign)

        int *msgvec;
 {
        register *ip;
        int *msgvec;
 {
        register *ip;


@@ -276,7 +295,7 @@ type(msgvec)
                touch(mesg);
                mp = &message[mesg-1];
                dot = mp;
                touch(mesg);
                mp = &message[mesg-1];
                dot = mp;

-               print(mp, obuf);
+               print(mp, obuf, doign);

        }
        if (obuf != stdout) {
                pipef = NULL;
        }
        if (obuf != stdout) {
                pipef = NULL;


@@ -305,7 +324,7 @@ brokpipe()
  * Print the indicated message on standard output.
  */
 
  * Print the indicated message on standard output.
  */
 

-print(mp, obuf)
+print(mp, obuf, doign)

        register struct message *mp;
        FILE *obuf;
 {
        register struct message *mp;
        FILE *obuf;
 {


@@ -313,7 +332,7 @@ print(mp, obuf)
        if (value("quiet") == NOSTR)
                fprintf(obuf, "Message %2d:\n", mp - &message[0] + 1);
        touch(mp - &message[0] + 1);
        if (value("quiet") == NOSTR)
                fprintf(obuf, "Message %2d:\n", mp - &message[0] + 1);
        touch(mp - &message[0] + 1);

-       send(mp, obuf);
+       send(mp, obuf, doign);

 }
 
 /*
 }
 
 /*


@@ -410,6 +429,7 @@ folders()
        }
        switch ((pid = fork())) {
        case 0:
        }
        switch ((pid = fork())) {
        case 0:

+               sigchild();

                execlp("ls", "ls", dirname, 0);
                clrbuf(stdout);
                exit(1);
                execlp("ls", "ls", dirname, 0);
                clrbuf(stdout);
                exit(1);