diff options
| author | Karel Zak | 2012-10-19 16:27:58 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-10-19 16:27:58 +0200 |
| commit | a0fc344b785559a0ef3866a9ebe5c082affe84ed (patch) | |
| tree | 3c6d9e5300fffa4d784528f4123747be0c1b7e18 /term-utils/write.c | |
| parent | agetty: stop using MAXHOSTNAMELEN (diff) | |
| download | kernel-qcow2-util-linux-a0fc344b785559a0ef3866a9ebe5c082affe84ed.tar.gz kernel-qcow2-util-linux-a0fc344b785559a0ef3866a9ebe5c082affe84ed.tar.xz kernel-qcow2-util-linux-a0fc344b785559a0ef3866a9ebe5c082affe84ed.zip | |
write: stop using MAXHOSTNAMELEN
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils/write.c')
| -rw-r--r-- | term-utils/write.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/term-utils/write.c b/term-utils/write.c index 6c746b42c..03560065c 100644 --- a/term-utils/write.c +++ b/term-utils/write.c @@ -63,6 +63,7 @@ #include "carefulputc.h" #include "closestream.h" #include "nls.h" +#include "xalloc.h" static void __attribute__ ((__noreturn__)) usage(FILE * out); void search_utmp(char *, char *, char *, uid_t); @@ -312,7 +313,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) char *login, *pwuid, *nows; struct passwd *pwd; time_t now; - char path[PATH_MAX], host[MAXHOSTNAMELEN], line[512]; + char path[PATH_MAX], *host, line[512]; /* Determine our login name(s) before the we reopen() stdout */ if ((pwd = getpwuid(myuid)) != NULL) @@ -332,8 +333,10 @@ void do_write(char *tty, char *mytty, uid_t myuid) signal(SIGHUP, done); /* print greeting */ - if (gethostname(host, sizeof(host)) < 0) - strcpy(host, "???"); + host = xgethostname(); + if (!host) + host = xstrdup("???"); + now = time((time_t *) NULL); nows = ctime(&now); nows[16] = '\0'; @@ -344,6 +347,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) else printf(_("Message from %s@%s on %s at %s ..."), login, host, mytty, nows + 11); + free(host); printf("\r\n"); while (fgets(line, sizeof(line), stdin) != NULL) |