Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove possibly dangerous sprintf and strcpy calls.

Browse Source
This commit is contained in:
mrg 1997-02-11 08:21:03 +00:00
parent 2ba96e4833
commit a4d8e69073
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/write/write.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: write.c,v 1.7 1997/01/20 19:04:59 explorer Exp $ */ /* $NetBSD: write.c,v 1.8 1997/02/11 08:21:03 mrg Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -46,7 +46,7 @@ static char copyright[] =
#if 0 #if 0
static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95"; static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95";
#endif #endif
static char *rcsid = "$NetBSD: write.c,v 1.7 1997/01/20 19:04:59 explorer Exp $"; static char *rcsid = "$NetBSD: write.c,v 1.8 1997/02/11 08:21:03 mrg Exp $";
#endif /* not lint */ #endif /* not lint */
#include <sys/types.h> #include <sys/types.h>
@ -66,7 +66,7 @@ static char *rcsid = "$NetBSD: write.c,v 1.7 1997/01/20 19:04:59 explorer Exp $"
void done(); void done();
void do_write __P((char *, char *, uid_t)); void do_write __P((char *, char *, uid_t));
void wr_fputs __P((char *)); void wr_fputs __P((char *));
void search_utmp __P((char *, char *, char *, uid_t)); void search_utmp __P((char *, char *, char *, uid_t, int));
int term_chk __P((char *, int *, time_t *, int)); int term_chk __P((char *, int *, time_t *, int));
int utmp_chk __P((char *, char *)); int utmp_chk __P((char *, char *));
@ -107,7 +107,7 @@ main(argc, argv)
/* check args */ /* check args */
switch (argc) { switch (argc) {
case 2: case 2:
search_utmp(argv[1], tty, mytty, myuid); search_utmp(argv[1], tty, mytty, myuid, sizeof tty);
do_write(tty, mytty, myuid); do_write(tty, mytty, myuid);
break; break;
case 3: case 3:
@ -168,9 +168,10 @@ utmp_chk(user, tty)
* writing from, unless that's the only terminal with messages enabled. * writing from, unless that's the only terminal with messages enabled.
*/ */
void void
search_utmp(user, tty, mytty, myuid) search_utmp(user, tty, mytty, myuid, ttylen)
char *user, *tty, *mytty; char *user, *tty, *mytty;
uid_t myuid; uid_t myuid;
int ttylen;
{ {
struct utmp u; struct utmp u;
time_t bestatime, atime; time_t bestatime, atime;
@ -199,7 +200,7 @@ search_utmp(user, tty, mytty, myuid)
++nttys; ++nttys;
if (atime > bestatime) { if (atime > bestatime) {
bestatime = atime; bestatime = atime;
(void)strcpy(tty, atty); (void)strncpy(tty, atty, ttylen - 1);
} }
} }
@ -208,7 +209,7 @@ search_utmp(user, tty, mytty, myuid)
errx(1, "%s is not logged in", user); errx(1, "%s is not logged in", user);
if (nttys == 0) { if (nttys == 0) {
if (user_is_me) { /* ok, so write to yourself! */ if (user_is_me) { /* ok, so write to yourself! */
(void)strcpy(tty, mytty); (void)strncpy(tty, mytty, ttylen - 1);
return; return;
} }
errx(1, "%s has messages disabled", user); errx(1, "%s has messages disabled", user);
@ -230,7 +231,7 @@ term_chk(tty, msgsokP, atimeP, showerror)
struct stat s; struct stat s;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
(void)snprintf(path, sizeof(path), "/dev/%s", tty); (void)snprintf(path, sizeof path, "/dev/%s", tty);
if (stat(path, &s) < 0) { if (stat(path, &s) < 0) {
if (showerror) if (showerror)
warn("%s", path); warn("%s", path);
@ -261,7 +262,7 @@ do_write(tty, mytty, myuid)
else else
login = "???"; login = "???";
(void)snprintf(path, sizeof(path), "/dev/%s", tty); (void)snprintf(path, sizeof path, "/dev/%s", tty);
if ((freopen(path, "w", stdout)) == NULL) if ((freopen(path, "w", stdout)) == NULL)
err(1, "%s", path); err(1, "%s", path);
@ -270,7 +271,7 @@ do_write(tty, mytty, myuid)
/* print greeting */ /* print greeting */
if (gethostname(host, sizeof(host)) < 0) if (gethostname(host, sizeof(host)) < 0)
(void)strcpy(host, "???"); (void)strncpy(host, "???", sizeof(host) - 1);
now = time((time_t *)NULL); now = time((time_t *)NULL);
nows = ctime(&now); nows = ctime(&now);
nows[16] = '\0'; nows[16] = '\0';