diff options
| -rw-r--r-- | usr.bin/mail/cmd1.c | 14 | ||||
| -rw-r--r-- | usr.bin/mail/collect.c | 19 | ||||
| -rw-r--r-- | usr.bin/mail/lex.c | 11 | ||||
| -rw-r--r-- | usr.bin/mail/tty.c | 30 |
4 files changed, 23 insertions, 51 deletions
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c index 66e28520934..647d1891fa4 100644 --- a/usr.bin/mail/cmd1.c +++ b/usr.bin/mail/cmd1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd1.c,v 1.17 2001/01/16 05:36:08 millert Exp $ */ +/* $OpenBSD: cmd1.c,v 1.18 2001/06/23 23:04:21 millert Exp $ */ /* $NetBSD: cmd1.c,v 1.9 1997/07/09 05:29:48 mikel Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95"; #else -static char rcsid[] = "$OpenBSD: cmd1.c,v 1.17 2001/01/16 05:36:08 millert Exp $"; +static char rcsid[] = "$OpenBSD: cmd1.c,v 1.18 2001/06/23 23:04:21 millert Exp $"; #endif #endif /* not lint */ @@ -344,14 +344,8 @@ type1(msgvec, cmd, doign, page) { int nlines, *ip; struct message *mp; - char *cp; - FILE *obuf; - -#if __GNUC__ - /* Avoid siglongjmp clobbering */ - (void)&cp; - (void)&obuf; -#endif + char * volatile cp; + FILE * volatile obuf; obuf = stdout; if (sigsetjmp(pipestop, 1)) diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index 95af3e3bbb8..0274b3115c7 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: collect.c,v 1.20 2001/01/16 05:36:08 millert Exp $ */ +/* $OpenBSD: collect.c,v 1.21 2001/06/23 23:04:21 millert Exp $ */ /* $NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94"; #else -static char rcsid[] = "$OpenBSD: collect.c,v 1.20 2001/01/16 05:36:08 millert Exp $"; +static char rcsid[] = "$OpenBSD: collect.c,v 1.21 2001/06/23 23:04:21 millert Exp $"; #endif #endif /* not lint */ @@ -81,18 +81,11 @@ collect(hp, printheaders) int printheaders; { FILE *fbuf; - int lc, cc, escape, eofcount, fd, c, t; - char linebuf[LINESIZE], tempname[PATHSIZE], *cp, getsub; + int lc, cc, fd, c, t, lastlong, rc; + volatile int escape, eofcount, longline; + volatile char getsub; + char linebuf[LINESIZE], tempname[PATHSIZE], *cp; sigset_t oset, nset; - int longline, lastlong, rc; /* Can deal with lines > LINESIZE */ - -#if __GNUC__ - /* Avoid siglongjmp clobbering */ - (void)&escape; - (void)&eofcount; - (void)&getsub; - (void)&longline; -#endif collf = NULL; /* diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c index 148f618d8b4..debfeda5d22 100644 --- a/usr.bin/mail/lex.c +++ b/usr.bin/mail/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.22 2001/01/16 05:36:08 millert Exp $ */ +/* $OpenBSD: lex.c,v 1.23 2001/06/23 23:04:23 millert Exp $ */ /* $NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95"; #else -static char rcsid[] = "$OpenBSD: lex.c,v 1.22 2001/01/16 05:36:08 millert Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.23 2001/06/23 23:04:23 millert Exp $"; #endif #endif /* not lint */ @@ -214,12 +214,9 @@ int reset_on_stop; /* do a reset() if stopped */ void commands() { - int n, eofloop = 0; + int n; + volatile int eofloop = 0; char linebuf[LINESIZE]; -#if __GNUC__ - /* Avoid siglongjmp clobbering */ - (void)&eofloop; -#endif if (!sourcing) { if (signal(SIGINT, SIG_IGN) != SIG_IGN) diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c index bfb94561332..0bfb6006ebc 100644 --- a/usr.bin/mail/tty.c +++ b/usr.bin/mail/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.11 1997/11/14 00:24:00 millert Exp $ */ +/* $OpenBSD: tty.c,v 1.12 2001/06/23 23:04:23 millert Exp $ */ /* $NetBSD: tty.c,v 1.7 1997/07/09 05:25:46 mikel Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 4/20/95"; #else -static char rcsid[] = "$OpenBSD: tty.c,v 1.11 1997/11/14 00:24:00 millert Exp $"; +static char rcsid[] = "$OpenBSD: tty.c,v 1.12 2001/06/23 23:04:23 millert Exp $"; #endif #endif /* not lint */ @@ -70,26 +70,19 @@ grabh(hp, gflags) int gflags; { struct termios ttybuf; - sig_t saveint; + volatile sig_t saveint; #ifndef TIOCSTI sig_t savequit; #else # ifdef TIOCEXT - int extproc, flag; -#endif /* TIOCEXT */ + volatile int extproc; + int flag; +# endif /* TIOCEXT */ #endif sig_t savetstp; sig_t savettou; sig_t savettin; - int errs = 0; -#ifdef __GNUC__ - /* Avoid siglongjmp clobbering */ - (void)&saveint; - (void)&errs; -# ifdef TIOCEXT - (void)&extproc; -#endif /* TIOCEXT */ -#endif + volatile int errs = 0; savetstp = signal(SIGTSTP, SIG_DFL); savettou = signal(SIGTTOU, SIG_DFL); @@ -192,13 +185,8 @@ readtty(pr, src) char pr[], src[]; { char ch, canonb[BUFSIZ]; - int c; - char *cp, *cp2; -#if __GNUC__ - /* Avoid siglongjmp clobbering */ - (void)&c; - (void)&cp2; -#endif + volatile int c; + char *cp, * volatile cp2; fputs(pr, stdout); fflush(stdout); |