src/usr.bin/mail/collect.c - diff

Return to collect.c CVS log

Up to [local] / src / usr.bin / mail

Diff for /src/usr.bin/mail/collect.c between version 1.2 and 1.3

version 1.2, 1996/06/11 12:53:35

version 1.3, 1997/04/10 15:33:50

Line 86

char linebuf[LINESIZE], *cp;

extern char *tempMail;

char getsub;

sigset_t oset, nset;

int omask;

#if __GNUC__

/* Avoid longjmp clobbering */

(void) &escape;

Line 99

* Start catching signals from here, but we're still die on interrupts

* until we're in the main loop.

sigemptyset(&nset);

omask = sigblock(sigmask(SIGINT) | sigmask(SIGHUP));

sigaddset(&nset, SIGINT);

sigaddset(&nset, SIGHUP);

sigprocmask(SIG_BLOCK, &nset, &oset);

if ((saveint = signal(SIGINT, SIG_IGN)) != SIG_IGN)

signal(SIGINT, collint);

if ((savehup = signal(SIGHUP, SIG_IGN)) != SIG_IGN)

Line 114

Line 111

rm(tempMail);

goto err;

}

sigprocmask(SIG_SETMASK, &oset, NULL);

sigsetmask(omask & ~(sigmask(SIGINT) | sigmask(SIGHUP)));

noreset++;

if ((collf = Fopen(tempMail, "w+")) == NULL) {

Line 389

Line 386

if (collf != NULL)

rewind(collf);

noreset--;

sigemptyset(&nset);

sigblock(sigmask(SIGINT) | sigmask(SIGHUP));

sigaddset(&nset, SIGINT);

sigaddset(&nset, SIGHUP);

sigprocmask(SIG_BLOCK, &nset, &oset);

signal(SIGINT, saveint);

signal(SIGHUP, savehup);

signal(SIGTSTP, savetstp);

signal(SIGTTOU, savettou);

signal(SIGTTIN, savettin);

sigprocmask(SIG_SETMASK, &oset, NULL);

sigsetmask(omask);

return collf;

}