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
Added declaration of icequal();
[unix-history]
/
usr
/
src
/
usr.bin
/
mail
/
collect.c
diff --git
a/usr/src/usr.bin/mail/collect.c
b/usr/src/usr.bin/mail/collect.c
index
765b745
..
a7ed484
100644
(file)
--- a/
usr/src/usr.bin/mail/collect.c
+++ b/
usr/src/usr.bin/mail/collect.c
@@
-7,7
+7,7
@@
* ~ escapes.
*/
* ~ escapes.
*/
-static char *SccsId = "@(#)collect.c 2.3 %G%";
+static char *SccsId = "@(#)collect.c 2.
1
3 %G%";
#include "rcv.h"
#include <sys/stat.h>
#include "rcv.h"
#include <sys/stat.h>
@@
-27,7
+27,9
@@
static char *SccsId = "@(#)collect.c 2.3 %G%";
static int (*savesig)(); /* Previous SIGINT value */
static int (*savehup)(); /* Previous SIGHUP value */
static int (*savesig)(); /* Previous SIGINT value */
static int (*savehup)(); /* Previous SIGHUP value */
+# ifdef VMUNIX
static int (*savecont)(); /* Previous SIGCONT value */
static int (*savecont)(); /* Previous SIGCONT value */
+# endif VMUNIX
static FILE *newi; /* File for saving away */
static FILE *newo; /* Output side of same */
static int hf; /* Ignore interrups */
static FILE *newi; /* File for saving away */
static FILE *newo; /* Output side of same */
static int hf; /* Ignore interrups */
@@
-45,6
+47,7
@@
collect(hp)
char linebuf[LINESIZE], *cp;
extern char tempMail[];
int notify();
char linebuf[LINESIZE], *cp;
extern char tempMail[];
int notify();
+ extern collintsig(), collhupsig();
noreset++;
ibuf = obuf = NULL;
noreset++;
ibuf = obuf = NULL;
@@
-53,11
+56,16
@@
collect(hp)
else
hf = 0;
hadintr = 0;
else
hf = 0;
hadintr = 0;
+# ifdef VMUNIX
if ((savesig = sigset(SIGINT, SIG_IGN)) != SIG_IGN)
sigset(SIGINT, hf ? intack : collrub), sighold(SIGINT);
if ((savehup = sigset(SIGHUP, SIG_IGN)) != SIG_IGN)
if ((savesig = sigset(SIGINT, SIG_IGN)) != SIG_IGN)
sigset(SIGINT, hf ? intack : collrub), sighold(SIGINT);
if ((savehup = sigset(SIGHUP, SIG_IGN)) != SIG_IGN)
- sigset(SIGHUP, collrub), sighold(SIG
INT
);
+ sigset(SIGHUP, collrub), sighold(SIG
HUP
);
savecont = sigset(SIGCONT, collcont);
savecont = sigset(SIGCONT, collcont);
+# else VMUNIX
+ savesig = signal(SIGINT, SIG_IGN);
+ savehup = signal(SIGHUP, SIG_IGN);
+# endif VMUNIX
newi = NULL;
newo = NULL;
if ((obuf = fopen(tempMail, "w")) == NULL) {
newi = NULL;
newo = NULL;
if ((obuf = fopen(tempMail, "w")) == NULL) {
@@
-96,8
+104,15
@@
collect(hp)
eof = 0;
for (;;) {
setjmp(coljmp);
eof = 0;
for (;;) {
setjmp(coljmp);
+# ifdef VMUNIX
sigrelse(SIGINT);
sigrelse(SIGHUP);
sigrelse(SIGINT);
sigrelse(SIGHUP);
+# else VMUNIX
+ if (savesig != SIG_IGN)
+ signal(SIGINT, hf ? intack : collintsig);
+ if (savehup != SIG_IGN)
+ signal(SIGHUP, collhupsig);
+# endif VMUNIX
flush();
if (readline(stdin, linebuf) <= 0) {
if (intty && value("ignoreeof") != NOSTR) {
flush();
if (readline(stdin, linebuf) <= 0) {
if (intty && value("ignoreeof") != NOSTR) {
@@
-111,7
+126,8
@@
collect(hp)
}
eof = 0;
hadintr = 0;
}
eof = 0;
hadintr = 0;
- if (intty && equal(".", linebuf) && value("dot") != NOSTR)
+ if (intty && equal(".", linebuf) &&
+ (value("dot") != NOSTR || value("ignoreeof") != NOSTR))
break;
if (linebuf[0] != escape || rflag != NOSTR) {
if ((t = putline(obuf, linebuf)) < 0)
break;
if (linebuf[0] != escape || rflag != NOSTR) {
if ((t = putline(obuf, linebuf)) < 0)
@@
-159,13
+175,14
@@
collect(hp)
*/
execute(&linebuf[2], 1);
*/
execute(&linebuf[2], 1);
+ printf("(continue)\n");
break;
case '.':
/*
* Simulate end of file on input.
*/
break;
case '.':
/*
* Simulate end of file on input.
*/
- goto eof;
+ goto eof
l
;
case 'q':
case 'Q':
case 'q':
case 'Q':
@@
-315,7
+332,7
@@
collect(hp)
case '?':
if ((fbuf = fopen(THELPFILE, "r")) == NULL) {
case '?':
if ((fbuf = fopen(THELPFILE, "r")) == NULL) {
- p
rintf("No help just now.\n"
);
+ p
error(THELPFILE
);
break;
}
t = getc(fbuf);
break;
}
t = getc(fbuf);
@@
-375,12
+392,14
@@
collect(hp)
break;
}
}
break;
}
}
-eof:
+eof
l
:
fclose(obuf);
rewind(ibuf);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
fclose(obuf);
rewind(ibuf);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
+# ifdef VMUNIX
sigset(SIGCONT, savecont);
sigset(SIGCONT, savecont);
+# endif VMUNIX
noreset = 0;
return(ibuf);
noreset = 0;
return(ibuf);
@@
-391,7
+410,9
@@
err:
fclose(obuf);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
fclose(obuf);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
+# ifdef VMUNIX
sigset(SIGCONT, savecont);
sigset(SIGCONT, savecont);
+# endif VMUNIX
noreset = 0;
return(NULL);
}
noreset = 0;
return(NULL);
}
@@
-427,7
+448,7
@@
exwrite(name, ibuf, f)
printf("\"%s\" ", name);
fflush(stdout);
}
printf("\"%s\" ", name);
fflush(stdout);
}
- if (stat(name, &junk) >= 0) {
+ if (stat(name, &junk) >= 0
&& (junk.st_mode & S_IFMT) == S_IFREG
) {
if (!f)
fprintf(stderr, "%s: ", name);
fprintf(stderr, "File exists\n", name);
if (!f)
fprintf(stderr, "%s: ", name);
fprintf(stderr, "File exists\n", name);
@@
-471,13
+492,15
@@
mesedit(ibuf, obuf, c)
int pid, s;
FILE *fbuf;
register int t;
int pid, s;
FILE *fbuf;
register int t;
- int (*sig)(), (*scont)(),
foonly
();
+ int (*sig)(), (*scont)(),
signull
();
struct stat sbuf;
extern char tempMail[], tempEdit[];
register char *edit;
sig = sigset(SIGINT, SIG_IGN);
struct stat sbuf;
extern char tempMail[], tempEdit[];
register char *edit;
sig = sigset(SIGINT, SIG_IGN);
- scont = sigset(SIGCONT, foonly);
+# ifdef VMUNIX
+ scont = sigset(SIGCONT, signull);
+# endif VMUNIX
if (stat(tempEdit, &sbuf) >= 0) {
printf("%s: file exists\n", tempEdit);
goto out;
if (stat(tempEdit, &sbuf) >= 0) {
printf("%s: file exists\n", tempEdit);
goto out;
@@
-505,6
+528,7
@@
mesedit(ibuf, obuf, c)
edit = c == 'e' ? EDITOR : VISUAL;
pid = vfork();
if (pid == 0) {
edit = c == 'e' ? EDITOR : VISUAL;
pid = vfork();
if (pid == 0) {
+ sigchild();
if (sig != SIG_IGN)
sigsys(SIGINT, SIG_DFL);
execl(edit, edit, tempEdit, 0);
if (sig != SIG_IGN)
sigsys(SIGINT, SIG_DFL);
execl(edit, edit, tempEdit, 0);
@@
-518,7
+542,7
@@
mesedit(ibuf, obuf, c)
}
while (wait(&s) != pid)
;
}
while (wait(&s) != pid)
;
- if (
s
!= 0) {
+ if (
(s & 0377)
!= 0) {
printf("Fatal error in \"%s\"\n", edit);
remove(tempEdit);
goto out;
printf("Fatal error in \"%s\"\n", edit);
remove(tempEdit);
goto out;
@@
-547,19
+571,14
@@
mesedit(ibuf, obuf, c)
fix:
perror(tempEdit);
out:
fix:
perror(tempEdit);
out:
+# ifdef VMUNIX
sigset(SIGCONT, scont);
sigset(SIGCONT, scont);
+# endif VMUNIX
sigset(SIGINT, sig);
newi = ibuf;
return(obuf);
}
sigset(SIGINT, sig);
newi = ibuf;
return(obuf);
}
-/*
- * Currently, Berkeley virtual VAX/UNIX will not let you change the
- * disposition of SIGCONT, except to trap it somewhere new.
- * Hence, sigset(SIGCONT, foonly) is used to ignore continue signals.
- */
-foonly() {}
-
/*
* Pipe the message through the command.
* Old message is on stdin of command;
/*
* Pipe the message through the command.
* Old message is on stdin of command;
@@
-604,6
+623,7
@@
mespipe(ibuf, obuf, cmd)
* stdout = new message.
*/
* stdout = new message.
*/
+ sigchild();
close(0);
dup(fileno(ibuf));
close(1);
close(0);
dup(fileno(ibuf));
close(1);
@@
-650,7
+670,6
@@
err:
* the message temporary. The flag argument is 'm' if we
* should shift over and 'f' if not.
*/
* the message temporary. The flag argument is 'm' if we
* should shift over and 'f' if not.
*/
-
forward(ms, obuf, f)
char ms[];
FILE *obuf;
forward(ms, obuf, f)
char ms[];
FILE *obuf;
@@
-676,12
+695,12
@@
forward(ms, obuf, f)
touch(*ip);
printf(" %d", *ip);
if (f == 'm') {
touch(*ip);
printf(" %d", *ip);
if (f == 'm') {
- if (transmit(&message[*ip-1], obuf) < 0) {
+ if (transmit(&message[*ip-1], obuf) < 0
L
) {
perror(tempMail);
return(-1);
}
} else
perror(tempMail);
return(-1);
}
} else
- if (send(&message[*ip-1], obuf) < 0) {
+ if (send(&message[*ip-1], obuf
, 0
) < 0) {
perror(tempMail);
return(-1);
}
perror(tempMail);
return(-1);
}
@@
-697,28
+716,30
@@
forward(ms, obuf, f)
* on error.
*/
* on error.
*/
+long
transmit(mailp, obuf)
struct message *mailp;
FILE *obuf;
{
register struct message *mp;
transmit(mailp, obuf)
struct message *mailp;
FILE *obuf;
{
register struct message *mp;
- register int c, ch;
- int n, bol;
+ register int ch;
+ long c, n;
+ int bol;
FILE *ibuf;
mp = mailp;
ibuf = setinput(mp);
FILE *ibuf;
mp = mailp;
ibuf = setinput(mp);
- c = m
size(mp)
;
+ c = m
p->m_size
;
n = c;
bol = 1;
n = c;
bol = 1;
- while (c-- > 0) {
+ while (c-- > 0
L
) {
if (bol) {
bol = 0;
putc('\t', obuf);
n++;
if (ferror(obuf)) {
perror("/tmp");
if (bol) {
bol = 0;
putc('\t', obuf);
n++;
if (ferror(obuf)) {
perror("/tmp");
- return(-1);
+ return(-1
L
);
}
}
ch = getc(ibuf);
}
}
ch = getc(ibuf);
@@
-727,7
+748,7
@@
transmit(mailp, obuf)
putc(ch, obuf);
if (ferror(obuf)) {
perror("/tmp");
putc(ch, obuf);
if (ferror(obuf)) {
perror("/tmp");
- return(-1);
+ return(-1
L
);
}
}
return(n);
}
}
return(n);
@@
-751,6
+772,20
@@
collcont(s)
* were previously set anyway.
*/
* were previously set anyway.
*/
+# ifndef VMUNIX
+collintsig()
+{
+ signal(SIGINT, SIG_IGN);
+ collrub(SIGINT);
+}
+
+collhupsig()
+{
+ signal(SIGHUP, SIG_IGN);
+ collrub(SIGHUP);
+}
+# endif VMUNIX
+
collrub(s)
{
register FILE *dbuf;
collrub(s)
{
register FILE *dbuf;
@@
-760,7
+795,9
@@
collrub(s)
hadintr++;
clrbuf(stdout);
printf("\n(Interrupt -- one more to kill letter)\n");
hadintr++;
clrbuf(stdout);
printf("\n(Interrupt -- one more to kill letter)\n");
+# ifdef VMUNIX
sigrelse(s);
sigrelse(s);
+# endif VMUNIX
longjmp(coljmp, 1);
}
fclose(newo);
longjmp(coljmp, 1);
}
fclose(newo);
@@
-778,7
+815,9
@@
done:
fclose(newi);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
fclose(newi);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
+# ifdef VMUNIX
sigset(SIGCONT, savecont);
sigset(SIGCONT, savecont);
+# endif VMUNIX
if (rcvmode) {
if (s == SIGHUP)
hangup(SIGHUP);
if (rcvmode) {
if (s == SIGHUP)
hangup(SIGHUP);
@@
-796,7
+835,6
@@
done:
intack(s)
{
intack(s)
{
- sigrelse(SIGCONT);
puts("@");
fflush(stdout);
clearerr(stdin);
puts("@");
fflush(stdout);
clearerr(stdin);
projects / unix-history / blobdiff