wall: use xgethostname()
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
parent
9b80bef687
commit
2281e1eda3
|
@ -182,10 +182,9 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
|
||||||
struct stat sbuf;
|
struct stat sbuf;
|
||||||
time_t now;
|
time_t now;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
char *p, *whom, *where, *hostname, *lbuf, *tmpname, *mbuf;
|
char *p, *whom, *where, *lbuf, *tmpname, *mbuf;
|
||||||
long line_max;
|
long line_max;
|
||||||
|
|
||||||
hostname = xmalloc(sysconf(_SC_HOST_NAME_MAX) + 1);
|
|
||||||
line_max = sysconf(_SC_LINE_MAX);
|
line_max = sysconf(_SC_LINE_MAX);
|
||||||
lbuf = xmalloc(line_max);
|
lbuf = xmalloc(line_max);
|
||||||
|
|
||||||
|
@ -195,6 +194,7 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
|
||||||
free(tmpname);
|
free(tmpname);
|
||||||
|
|
||||||
if (print_banner == TRUE) {
|
if (print_banner == TRUE) {
|
||||||
|
char *hostname = xgethostname();
|
||||||
if (!(whom = getlogin()) || !*whom)
|
if (!(whom = getlogin()) || !*whom)
|
||||||
whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
|
whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
|
||||||
if (!whom) {
|
if (!whom) {
|
||||||
|
@ -206,7 +206,6 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
|
||||||
where = "somewhere";
|
where = "somewhere";
|
||||||
warn(_("cannot get tty name"));
|
warn(_("cannot get tty name"));
|
||||||
}
|
}
|
||||||
gethostname(hostname, sizeof(hostname));
|
|
||||||
time(&now);
|
time(&now);
|
||||||
lt = localtime(&now);
|
lt = localtime(&now);
|
||||||
|
|
||||||
|
@ -222,6 +221,7 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
|
||||||
fprintf(fp, "\r%79s\r\n", " ");
|
fprintf(fp, "\r%79s\r\n", " ");
|
||||||
sprintf(lbuf, _("Broadcast Message from %s@%s"),
|
sprintf(lbuf, _("Broadcast Message from %s@%s"),
|
||||||
whom, hostname);
|
whom, hostname);
|
||||||
|
free(hostname);
|
||||||
fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
|
fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
|
||||||
sprintf(lbuf, " (%s) at %d:%02d ...",
|
sprintf(lbuf, " (%s) at %d:%02d ...",
|
||||||
where, lt->tm_hour, lt->tm_min);
|
where, lt->tm_hour, lt->tm_min);
|
||||||
|
@ -229,7 +229,6 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
|
||||||
}
|
}
|
||||||
fprintf(fp, "%79s\r\n", " ");
|
fprintf(fp, "%79s\r\n", " ");
|
||||||
|
|
||||||
free(hostname);
|
|
||||||
|
|
||||||
if (fname) {
|
if (fname) {
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue