From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 03/19] write: stop using MAXHOSTNAMELEN
Date: Sun, 14 Oct 2012 21:20:54 +0100 [thread overview]
Message-ID: <1350246070-10544-4-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1350246070-10544-1-git-send-email-kerolasa@iki.fi>
Use the sysconf(_SC_HOST_NAME_MAX) to determine maximum length of a
hostname.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
term-utils/write.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/term-utils/write.c b/term-utils/write.c
index 6c746b4..29b684b 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,7 +333,8 @@ void do_write(char *tty, char *mytty, uid_t myuid)
signal(SIGHUP, done);
/* print greeting */
- if (gethostname(host, sizeof(host)) < 0)
+ host = xmalloc(sizeof(char) * (sysconf(_SC_HOST_NAME_MAX) + 1));
+ if (gethostname(host, sysconf(_SC_HOST_NAME_MAX)) < 0)
strcpy(host, "???");
now = time((time_t *) NULL);
nows = ctime(&now);
@@ -344,6 +346,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)
--
1.7.12.2
next prev parent reply other threads:[~2012-10-14 20:21 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-14 20:20 [PATCH 00/19] compliancy fixes Sami Kerola
2012-10-14 20:20 ` [PATCH 01/19] last: stop using MAXHOSTNAMELEN Sami Kerola
2012-10-15 1:46 ` Mike Frysinger
2012-10-14 20:20 ` [PATCH 02/19] login: " Sami Kerola
2012-10-14 20:20 ` Sami Kerola [this message]
2012-10-15 2:12 ` [PATCH 03/19] write: " Mike Frysinger
[not found] ` <20121015152558.GK18377@x2.net.home>
2012-10-18 20:06 ` Sami Kerola
2012-10-22 6:01 ` Mike Frysinger
2012-10-22 8:06 ` Karel Zak
2012-10-22 8:09 ` Karel Zak
2012-10-22 20:03 ` Mike Frysinger
2012-10-22 20:22 ` Karel Zak
2012-10-14 20:20 ` [PATCH 04/19] agetty: " Sami Kerola
2012-10-14 20:20 ` [PATCH 05/19] c.h: remove unnecessary MAXHOSTNAMELEN fallback definition Sami Kerola
2012-10-14 20:20 ` [PATCH 06/19] docs: add line breaks to whereis.1 Sami Kerola
2012-10-14 20:20 ` [PATCH 07/19] sd-daemon: fix cppcheck warnings Sami Kerola
2012-10-14 22:10 ` Dave Reisner
2012-10-15 8:32 ` Sami Kerola
2012-10-14 20:20 ` [PATCH 08/19] libmount: replace usleep with nanosleep Sami Kerola
2012-10-15 2:14 ` Mike Frysinger
2012-10-14 20:21 ` [PATCH 09/19] include/all-io: " Sami Kerola
2012-10-14 20:21 ` [PATCH 10/19] hwclock: " Sami Kerola
2012-10-14 20:21 ` [PATCH 11/19] rtcwake: " Sami Kerola
2012-10-14 20:21 ` [PATCH 12/19] agetty: " Sami Kerola
2012-10-14 20:21 ` [PATCH 13/19] tailf: " Sami Kerola
2012-10-14 20:21 ` [PATCH 14/19] include/usleep: remove remaining references to usleep Sami Kerola
2012-10-14 20:21 ` [PATCH 15/19] libmount, eject: replace index() and rindex() with strrch() or strrchr() Sami Kerola
2012-10-15 2:14 ` Mike Frysinger
2012-10-14 20:21 ` [PATCH 16/19] logger: replace gethostbyname() with getaddrinfo() Sami Kerola
2012-10-14 20:21 ` [PATCH 17/19] agetty: " Sami Kerola
2012-10-14 20:21 ` [PATCH 18/19] build-sys: remove gethostbyname() check Sami Kerola
2012-10-14 20:21 ` [PATCH 19/19] fsck.cramfs: replace utime() with utimensat() Sami Kerola
2012-10-15 2:17 ` Mike Frysinger
2012-10-15 8:36 ` Sami Kerola
2012-10-15 17:39 ` Mike Frysinger
2012-10-22 9:07 ` [PATCH 00/19] compliancy fixes Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350246070-10544-4-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).