changed delete to touch message and clear preserve and mbox bits

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

diff --git a/usr/src/usr.bin/mail/cmd2.c b/usr/src/usr.bin/mail/cmd2.c
index 3153425..9b8135e 100644 (file)
--- a/usr/src/usr.bin/mail/cmd2.c
+++ b/usr/src/usr.bin/mail/cmd2.c
@@ -9,7 +9,7 @@
  * More user commands.
  */
 
  * More user commands.
  */
 

-static char *SccsId = "@(#)cmd2.c      1.2 %G%";
+static char *SccsId = "@(#)cmd2.c      1.4 %G%";

 
 /*
  * If any arguments were given, go to the next applicable argument
 
 /*
  * If any arguments were given, go to the next applicable argument


@@ -65,10 +65,8 @@ next(msgvec)
         * Note that this must exist for us to get here at all.
         */
 
         * Note that this must exist for us to get here at all.
         */
 

-       if (!sawcom) {
-               dot = &message[0];
+       if (!sawcom)

                goto hitit;
                goto hitit;

-       }

 
        /*
         * Just find the next good message after dot, no
 
        /*
         * Just find the next good message after dot, no


@@ -313,8 +311,8 @@ delm(msgvec)
                mesg = *ip;
                touch(mesg);
                mp = &message[mesg-1];
                mesg = *ip;
                touch(mesg);
                mp = &message[mesg-1];

-               mp->m_flag |= MDELETED;
-               mp->m_flag &= ~(MPRESERVE|MSAVED);
+               mp->m_flag |= MDELETED|MTOUCH;
+               mp->m_flag &= ~(MPRESERVE|MSAVED|MBOX);

                last = mesg;
        }
        if (last != NULL) {
                last = mesg;
        }
        if (last != NULL) {