diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1996-10-28 00:45:59 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1996-10-28 00:45:59 +0000 |
| commit | a02bc38ce45e99943afe9f23eb22a1b051e7a27c (patch) | |
| tree | dc16be5cc43739294fe2ad48949ad9908485a328 /usr.bin | |
| parent | 05d5124b468036eba5839c2d4847c72ccaaaaa5f (diff) | |
Use snprintf(). Solves $HOME overflow and others.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/msgs/msgs.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c index d955a24cb00..47f16c90e12 100644 --- a/usr.bin/msgs/msgs.c +++ b/usr.bin/msgs/msgs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msgs.c,v 1.4 1996/09/16 02:26:12 deraadt Exp $ */ +/* $OpenBSD: msgs.c,v 1.5 1996/10/28 00:45:58 millert Exp $ */ /* $NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: msgs.c,v 1.4 1996/09/16 02:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: msgs.c,v 1.5 1996/10/28 00:45:58 millert Exp $"; #endif #endif /* not lint */ @@ -244,7 +244,7 @@ int argc; char *argv[]; /* * determine current message bounds */ - sprintf(fname, "%s/%s", _PATH_MSGS, BOUNDS); + snprintf(fname, sizeof(fname), "%s/%s", _PATH_MSGS, BOUNDS); bounds = fopen(fname, "r"); if (bounds != NULL) { @@ -282,7 +282,8 @@ int argc; char *argv[]; continue; if (clean) - sprintf(inbuf, "%s/%s", _PATH_MSGS, cp); + snprintf(inbuf, sizeof(inbuf), "%s/%s", + _PATH_MSGS, cp); while (isdigit(*cp)) i = i * 10 + *cp++ - '0'; @@ -338,7 +339,7 @@ int argc; char *argv[]; } nextmsg = lastmsg + 1; - sprintf(fname, "%s/%d", _PATH_MSGS, nextmsg); + snprintf(fname, sizeof(fname), "%s/%d", _PATH_MSGS, nextmsg); newmsg = fopen(fname, "w"); if (newmsg == NULL) { perror(fname); @@ -395,7 +396,7 @@ int argc; char *argv[]; totty = (isatty(fileno(stdout)) != 0); use_pager = use_pager && totty; - sprintf(fname, "%s/%s", getenv("HOME"), MSGSRC); + snprintf(fname, sizeof(fname), "%s/%s", getenv("HOME"), MSGSRC); msgsrc = fopen(fname, "r"); if (msgsrc) { newrc = NO; @@ -461,7 +462,7 @@ int argc; char *argv[]; */ for (msg = firstmsg; msg <= lastmsg; msg++) { - sprintf(fname, "%s/%d", _PATH_MSGS, msg); + snprintf(fname, sizeof(fname), "%s/%d", _PATH_MSGS, msg); newmsg = fopen(fname, "r"); if (newmsg == NULL) continue; @@ -617,7 +618,7 @@ int length; signal(SIGPIPE, SIG_IGN); signal(SIGQUIT, SIG_IGN); if ((env_pager = getenv("PAGER")) == NULL) { - sprintf(cmdbuf, _PATH_PAGER, Lpp); + snprintf(cmdbuf, sizeof(cmdbuf), _PATH_PAGER, Lpp); } else { strcpy(cmdbuf, env_pager); } @@ -741,7 +742,7 @@ char *prompt; cmsg = atoi(&inbuf[1]); else cmsg = msg; - sprintf(fname, "%s/%d", _PATH_MSGS, cmsg); + snprintf(fname, sizeof(fname), "%s/%d", _PATH_MSGS, cmsg); oldpos = ftell(newmsg); @@ -766,7 +767,7 @@ char *prompt; else { strcpy(fname, _PATH_TMPFILE); mktemp(fname); - sprintf(cmdbuf, _PATH_MAIL, fname); + snprintf(cmdbuf, sizeof(cmdbuf), _PATH_MAIL, fname); mailing = YES; } if ((fd = open(fname, O_RDWR|O_EXCL|O_CREAT|O_APPEND)) == -1 || |