d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of printing '(null)' if there is no tty, print 'no tty'.

Browse Source 
In the case where the program is executed by a daemon running in the
background the terminal might not have a tty. The '(null)' is confusing.
This commit is contained in:
n_hibma 2000-10-02 17:31:57 +00:00
parent 7e9332da79
commit d4edaae88f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,10 @@ makemsg(fname)
(void)unlink(tmpname); (void)unlink(tmpname);
if (!nobanner) { if (!nobanner) {
char *tty = ttyname(2);
if (!tty)
tty = "no tty";
if (!(whom = getlogin())) if (!(whom = getlogin()))
whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???"; whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
(void)gethostname(hostname, sizeof(hostname)); (void)gethostname(hostname, sizeof(hostname));
@ -172,7 +176,7 @@ makemsg(fname)
whom, hostname); whom, hostname);
(void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf); (void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
(void)snprintf(lbuf, sizeof(lbuf), (void)snprintf(lbuf, sizeof(lbuf),
" (%s) at %d:%02d %s...", ttyname(2), " (%s) at %d:%02d %s...", tty,
lt->tm_hour, lt->tm_min, lt->tm_zone); lt->tm_hour, lt->tm_min, lt->tm_zone);
(void)fprintf(fp, "%-79.79s\r\n", lbuf); (void)fprintf(fp, "%-79.79s\r\n", lbuf);
} }