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

- Check return value of ttyname(3) and prevent to pass NULL pointer for

Browse Source 
"%s" in printf style format string.
- Use STDERR_FILENO as paramter for ttyname(3).
This commit is contained in:
taca 2000-09-04 15:21:24 +00:00
parent 824ddfd20e
commit 99ebb8038f
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/rwall/rwall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rwall.c,v 1.11 2000/06/14 06:49:22 cgd Exp $ */
/* $NetBSD: rwall.c,v 1.12 2000/09/04 15:21:24 taca Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988 Regents of the University of California.\n\
#if 0
static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";
#else
__RCSID("$NetBSD: rwall.c,v 1.11 2000/06/14 06:49:22 cgd Exp $");
__RCSID("$NetBSD: rwall.c,v 1.12 2000/09/04 15:21:24 taca Exp $");
#endif
#endif /* not lint */
@ -129,7 +129,7 @@ makemsg(fname)
FILE *fp;
int fd;
const char *whom;
char hostname[MAXHOSTNAMELEN + 1], lbuf[100], tmpname[32];
char *tty, hostname[MAXHOSTNAMELEN + 1], lbuf[100], tmpname[32];
(void)strcpy(tmpname, _PATH_TMP);
(void)strcat(tmpname, "/wall.XXXXXX");
@ -153,8 +153,13 @@ makemsg(fname)
*/
(void)fprintf(fp, "Remote Broadcast Message from %s@%s\n",
whom, hostname);
(void)fprintf(fp, " (%s) at %d:%02d ...\n", ttyname(2),
lt->tm_hour, lt->tm_min);
tty = ttyname(STDERR_FILENO);
if (tty == NULL)
(void)fprintf(fp, " at %d:%02d ...\n",
lt->tm_hour, lt->tm_min);
else
(void)fprintf(fp, " (%s) at %d:%02d ...\n", tty,
lt->tm_hour, lt->tm_min);
putc('\n', fp);

17
usr.bin/wall/wall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wall.c,v 1.13 2000/04/14 06:11:11 simonb Exp $ */
/* $NetBSD: wall.c,v 1.14 2000/09/04 15:21:24 taca Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
#endif
__RCSID("$NetBSD: wall.c,v 1.13 2000/04/14 06:11:11 simonb Exp $");
__RCSID("$NetBSD: wall.c,v 1.14 2000/09/04 15:21:24 taca Exp $");
#endif /* not lint */
/*
@ -138,7 +138,7 @@ makemsg(fname)
FILE *fp;
int fd;
const char *whom;
char *p, hostname[MAXHOSTNAMELEN+1], lbuf[100], tmpname[15];
char *p, *tty, hostname[MAXHOSTNAMELEN+1], lbuf[100], tmpname[15];
(void)snprintf(tmpname, sizeof tmpname, "%s/wall.XXXXXX", _PATH_TMP);
if ((fd = mkstemp(tmpname)) == -1 || !(fp = fdopen(fd, "r+")))
@ -164,8 +164,15 @@ makemsg(fname)
(void)snprintf(lbuf, sizeof lbuf,
"Broadcast Message from %s@%s", whom, hostname);
(void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
(void)snprintf(lbuf, sizeof lbuf, " (%s) at %d:%02d ...",
ttyname(2), lt->tm_hour, lt->tm_min);
tty = ttyname(STDERR_FILENO);
if (tty == NULL)
(void)snprintf(lbuf, sizeof lbuf,
" at %d:%02d ...",
lt->tm_hour, lt->tm_min);
else
(void)snprintf(lbuf, sizeof lbuf,
" (%s) at %d:%02d ...",
tty, lt->tm_hour, lt->tm_min);
(void)fprintf(fp, "%-79.79s\r\n", lbuf);
}
(void)fprintf(fp, "%79s\r\n", " ");