include aculib in cleanup

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

diff --git a/usr/src/usr.bin/mail/quit.c b/usr/src/usr.bin/mail/quit.c
index b044289..f1acaec 100644 (file)
--- a/usr/src/usr.bin/mail/quit.c
+++ b/usr/src/usr.bin/mail/quit.c
@@ -9,7 +9,7 @@
  * Termination processing.
  */
 
  * Termination processing.
  */
 

-static char *SccsId = "@(#)quit.c      2.2 %G%";
+static char *SccsId = "@(#)quit.c      2.6 %G%";

 
 /*
  * Save all of the undetermined messages at the top of "mbox"
 
 /*
  * Save all of the undetermined messages at the top of "mbox"


@@ -19,7 +19,7 @@ static char *SccsId = "@(#)quit.c     2.2 %G%";
 
 quit()
 {
 
 quit()
 {

-       int mcount, p, modify, autohold, anystat, holdbit;
+       int mcount, p, modify, autohold, anystat, holdbit, nohold;

        FILE *ibuf, *obuf, *fbuf, *rbuf, *readstat;
        register struct message *mp;
        register int c;
        FILE *ibuf, *obuf, *fbuf, *rbuf, *readstat;
        register struct message *mp;
        register int c;


@@ -89,6 +89,9 @@ quit()
        anystat = 0;
        autohold = value("hold") != NOSTR;
        holdbit = autohold ? MPRESERVE : MBOX;
        anystat = 0;
        autohold = value("hold") != NOSTR;
        holdbit = autohold ? MPRESERVE : MBOX;

+       nohold = MBOX|MSAVED|MDELETED|MPRESERVE;
+       if (value("keepsave") != NOSTR)
+               nohold &= ~MSAVED;

        for (mp = &message[0]; mp < &message[msgCount]; mp++) {
                if (mp->m_flag & MNEW) {
                        mp->m_flag &= ~MNEW;
        for (mp = &message[0]; mp < &message[msgCount]; mp++) {
                if (mp->m_flag & MNEW) {
                        mp->m_flag &= ~MNEW;


@@ -98,7 +101,7 @@ quit()
                        anystat++;
                if ((mp->m_flag & MTOUCH) == 0)
                        mp->m_flag |= MPRESERVE;
                        anystat++;
                if ((mp->m_flag & MTOUCH) == 0)
                        mp->m_flag |= MPRESERVE;

-               if ((mp->m_flag & (MBOX|MSAVED|MDELETED|MPRESERVE)) == 0)
+               if ((mp->m_flag & nohold) == 0)

                        mp->m_flag |= holdbit;
        }
        modify = 0;
                        mp->m_flag |= holdbit;
        }
        modify = 0;


@@ -174,7 +177,7 @@ quit()
                }
                fclose(obuf);
                close(creat(mbox, 0600));
                }
                fclose(obuf);
                close(creat(mbox, 0600));

-               if ((obuf = fopen(mbox, "w")) == NULL) {
+               if ((obuf = fopen(mbox, "r+")) == NULL) {

                        perror(mbox);
                        fclose(ibuf);
                        unlock();
                        perror(mbox);
                        fclose(ibuf);
                        unlock();


@@ -189,7 +192,7 @@ quit()
                }
        for (mp = &message[0]; mp < &message[msgCount]; mp++)
                if (mp->m_flag & MBOX)
                }
        for (mp = &message[0]; mp < &message[msgCount]; mp++)
                if (mp->m_flag & MBOX)

-                       if (send(mp, obuf) < 0) {
+                       if (send(mp, obuf, 0) < 0) {

                                perror(mbox);
                                fclose(ibuf);
                                fclose(obuf);
                                perror(mbox);
                                fclose(ibuf);
                                fclose(obuf);


@@ -215,6 +218,7 @@ quit()
                fclose(ibuf);
                fflush(obuf);
        }
                fclose(ibuf);
                fflush(obuf);
        }

+       trunc(obuf);

        if (ferror(obuf)) {
                perror(mbox);
                fclose(obuf);
        if (ferror(obuf)) {
                perror(mbox);
                fclose(obuf);


@@ -245,12 +249,13 @@ quit()
 
 cream:
        if (rbuf != NULL) {
 
 cream:
        if (rbuf != NULL) {

-               fbuf = fopen(mailname, "w");
+               fbuf = fopen(mailname, "r+");

                if (fbuf == NULL)
                        goto newmail;
                while ((c = getc(rbuf)) != EOF)
                        putc(c, fbuf);
                fclose(rbuf);
                if (fbuf == NULL)
                        goto newmail;
                while ((c = getc(rbuf)) != EOF)
                        putc(c, fbuf);
                fclose(rbuf);

+               trunc(fbuf);

                fclose(fbuf);
                alter(mailname);
                unlock();
                fclose(fbuf);
                alter(mailname);
                unlock();


@@ -271,7 +276,6 @@ newmail:
  * saved.  On any error, just return -1.  Else return 0.
  * Incorporate the any new mail that we found.
  */
  * saved.  On any error, just return -1.  Else return 0.
  * Incorporate the any new mail that we found.
  */

-

 writeback(res)
        register FILE *res;
 {
 writeback(res)
        register FILE *res;
 {


@@ -280,7 +284,7 @@ writeback(res)
        FILE *obuf;
 
        p = 0;
        FILE *obuf;
 
        p = 0;

-       if ((obuf = fopen(mailname, "w")) == NULL) {
+       if ((obuf = fopen(mailname, "r+")) == NULL) {

                perror(mailname);
                return(-1);
        }
                perror(mailname);
                return(-1);
        }


@@ -292,7 +296,7 @@ writeback(res)
        for (mp = &message[0]; mp < &message[msgCount]; mp++)
                if ((mp->m_flag&MPRESERVE)||(mp->m_flag&MTOUCH)==0) {
                        p++;
        for (mp = &message[0]; mp < &message[msgCount]; mp++)
                if ((mp->m_flag&MPRESERVE)||(mp->m_flag&MTOUCH)==0) {
                        p++;

-                       if (send(mp, obuf) < 0) {
+                       if (send(mp, obuf, 0) < 0) {

                                perror(mailname);
                                fclose(obuf);
                                return(-1);
                                perror(mailname);
                                fclose(obuf);
                                return(-1);


@@ -304,6 +308,7 @@ writeback(res)
                        putc(c, obuf);
 #endif
        fflush(obuf);
                        putc(c, obuf);
 #endif
        fflush(obuf);

+       trunc(obuf);

        if (ferror(obuf)) {
                perror(mailname);
                fclose(obuf);
        if (ferror(obuf)) {
                perror(mailname);
                fclose(obuf);