projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified holdsigs() to use sighold() rather than sigset()
[unix-history]
/
usr
/
src
/
usr.bin
/
mail
/
fio.c
diff --git
a/usr/src/usr.bin/mail/fio.c
b/usr/src/usr.bin/mail/fio.c
index
a8d2a2e
..
a40e0a2
100644
(file)
--- a/
usr/src/usr.bin/mail/fio.c
+++ b/
usr/src/usr.bin/mail/fio.c
@@
-10,7
+10,7
@@
* File I/O.
*/
* File I/O.
*/
-static char *SccsId = "@(#)fio.c 2.
8
%G%";
+static char *SccsId = "@(#)fio.c 2.
13
%G%";
/*
* Set up the input pointers while copying the mail file into
/*
* Set up the input pointers while copying the mail file into
@@
-22,7
+22,8
@@
setptr(ibuf)
{
register int c;
register char *cp, *cp2;
{
register int c;
register char *cp, *cp2;
- register int count, s, l;
+ register int count, l;
+ long s;
off_t offset;
char linebuf[LINESIZE];
char wbuf[LINESIZE];
off_t offset;
char linebuf[LINESIZE];
char wbuf[LINESIZE];
@@
-34,7
+35,7
@@
setptr(ibuf)
exit(1);
msgCount = 0;
offset = 0;
exit(1);
msgCount = 0;
offset = 0;
- s = 0;
+ s = 0
L
;
l = 0;
maybe = 1;
flag = MUSED|MNEW;
l = 0;
maybe = 1;
flag = MUSED|MNEW;
@@
-84,7
+85,7
@@
setptr(ibuf)
this.m_offset = offsetof(offset);
this.m_size = s;
this.m_lines = l;
this.m_offset = offsetof(offset);
this.m_size = s;
this.m_lines = l;
- s = 0;
+ s = 0
L
;
l = 0;
if (append(&this, mestmp)) {
perror(tempSet);
l = 0;
if (append(&this, mestmp)) {
perror(tempSet);
@@
-109,7
+110,7
@@
setptr(ibuf)
}
}
offset += count;
}
}
offset += count;
- s += count;
+ s +=
(long)
count;
l++;
maybe = 0;
if (linebuf[0] == 0)
l++;
maybe = 0;
if (linebuf[0] == 0)
@@
-248,7
+249,7
@@
makemessage(f)
m->m_lines = (m+1)->m_lines;
m->m_flag = (m+1)->m_flag;
}
m->m_lines = (m+1)->m_lines;
m->m_flag = (m+1)->m_flag;
}
- message[msgCount].m_size = 0;
+ message[msgCount].m_size = 0
L
;
message[msgCount].m_lines = 0;
}
message[msgCount].m_lines = 0;
}
@@
-361,7
+362,7
@@
edstop()
if ((mp->m_flag & MDELETED) != 0)
continue;
c++;
if ((mp->m_flag & MDELETED) != 0)
continue;
c++;
- if (send(mp, obuf) < 0) {
+ if (send(mp, obuf
, 0
) < 0) {
perror(editfile);
relsesigs();
reset(0);
perror(editfile);
relsesigs();
reset(0);
@@
-392,10
+393,7
@@
done:
relsesigs();
}
relsesigs();
}
-# ifndef VMUNIX
-static int SaveSigs[32];
-# endif VMUNIX
-
+static int sigdepth = 0; /* depth of holdsigs() */
/*
* Hold signals SIGHUP - SIGQUIT.
*/
/*
* Hold signals SIGHUP - SIGQUIT.
*/
@@
-403,12
+401,9
@@
holdsigs()
{
register int i;
{
register int i;
- for (i = SIGHUP; i <= SIGQUIT; i++)
-# ifdef VMUNIX
- sighold(i);
-# else
- SaveSigs[i] = signal(i, SIG_IGN);
-# endif
+ if (sigdepth++ == 0)
+ for (i = SIGHUP; i <= SIGQUIT; i++)
+ sighold(i);
}
/*
}
/*
@@
-418,12
+413,9
@@
relsesigs()
{
register int i;
{
register int i;
- for (i = SIGHUP; i <= SIGQUIT; i++)
-# ifdef VMUNIX
- sigrelse(i);
-# else
- signal(i, SaveSigs[i]);
-# endif
+ if (--sigdepth == 0)
+ for (i = SIGHUP; i <= SIGQUIT; i++)
+ sigrelse(i);
}
/*
}
/*
@@
-520,6
+512,7
@@
expand(name)
}
sprintf(cmdbuf, "echo %s", name);
if ((pid = vfork()) == 0) {
}
sprintf(cmdbuf, "echo %s", name);
if ((pid = vfork()) == 0) {
+ sigchild();
Shell = value("SHELL");
if (Shell == NOSTR)
Shell = SHELL;
Shell = value("SHELL");
if (Shell == NOSTR)
Shell = SHELL;