* ~ escapes.
*/
-static char *SccsId = "@(#)collect.c 2.2 %G%";
+static char *SccsId = "@(#)collect.c 2.13 %G%";
#include "rcv.h"
#include <sys/stat.h>
static int (*savesig)(); /* Previous SIGINT value */
static int (*savehup)(); /* Previous SIGHUP value */
+# ifdef VMUNIX
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 */
char linebuf[LINESIZE], *cp;
extern char tempMail[];
int notify();
+ extern collintsig(), collhupsig();
noreset++;
ibuf = obuf = NULL;
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)
- sigset(SIGHUP, collrub), sighold(SIGINT);
+ sigset(SIGHUP, collrub), sighold(SIGHUP);
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) {
eof = 0;
for (;;) {
setjmp(coljmp);
+# ifdef VMUNIX
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) {
if (++eof > 35)
break;
- printf("Use \"%cq\" to terminate letter\n",
+ printf("Use \".\" to terminate letter\n",
escape);
continue;
}
}
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)
*/
execute(&linebuf[2], 1);
+ printf("(continue)\n");
break;
case '.':
/*
* Simulate end of file on input.
*/
- goto eof;
+ goto eofl;
case 'q':
case 'Q':
case '?':
if ((fbuf = fopen(THELPFILE, "r")) == NULL) {
- printf("No help just now.\n");
+ perror(THELPFILE);
break;
}
t = getc(fbuf);
break;
}
}
-eof:
+eofl:
fclose(obuf);
rewind(ibuf);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
+# ifdef VMUNIX
sigset(SIGCONT, savecont);
+# endif VMUNIX
noreset = 0;
return(ibuf);
fclose(obuf);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
+# ifdef VMUNIX
sigset(SIGCONT, savecont);
+# endif VMUNIX
noreset = 0;
return(NULL);
}
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);
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);
- 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;
edit = c == 'e' ? EDITOR : VISUAL;
pid = vfork();
if (pid == 0) {
+ sigchild();
if (sig != SIG_IGN)
sigsys(SIGINT, SIG_DFL);
execl(edit, edit, tempEdit, 0);
}
while (wait(&s) != pid)
;
- if (s != 0) {
+ if ((s & 0377) != 0) {
printf("Fatal error in \"%s\"\n", edit);
remove(tempEdit);
goto out;
fix:
perror(tempEdit);
out:
+# ifdef VMUNIX
sigset(SIGCONT, scont);
+# endif VMUNIX
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;
* stdout = new message.
*/
+ sigchild();
close(0);
dup(fileno(ibuf));
close(1);
* 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;
touch(*ip);
printf(" %d", *ip);
if (f == 'm') {
- if (transmit(&message[*ip-1], obuf) < 0) {
+ if (transmit(&message[*ip-1], obuf) < 0L) {
perror(tempMail);
return(-1);
}
} else
- if (send(&message[*ip-1], obuf) < 0) {
+ if (send(&message[*ip-1], obuf, 0) < 0) {
perror(tempMail);
return(-1);
}
* on error.
*/
+long
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);
- c = msize(mp);
+ c = mp->m_size;
n = c;
bol = 1;
- while (c-- > 0) {
+ while (c-- > 0L) {
if (bol) {
bol = 0;
putc('\t', obuf);
n++;
if (ferror(obuf)) {
perror("/tmp");
- return(-1);
+ return(-1L);
}
}
ch = getc(ibuf);
putc(ch, obuf);
if (ferror(obuf)) {
perror("/tmp");
- return(-1);
+ return(-1L);
}
}
return(n);
* 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;
hadintr++;
clrbuf(stdout);
printf("\n(Interrupt -- one more to kill letter)\n");
+# ifdef VMUNIX
sigrelse(s);
+# endif VMUNIX
longjmp(coljmp, 1);
}
fclose(newo);
fclose(newi);
sigset(SIGINT, savesig);
sigset(SIGHUP, savehup);
+# ifdef VMUNIX
sigset(SIGCONT, savecont);
+# endif VMUNIX
if (rcvmode) {
if (s == SIGHUP)
hangup(SIGHUP);
intack(s)
{
- sigrelse(SIGCONT);
puts("@");
fflush(stdout);
clearerr(stdin);