From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 Jul 2016 11:20:58 +0000 (+0200)
Subject: write: don't use strftime()
X-Git-Tag: v2.29-rc1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aefd6a9d6a6c7626098439a5b9bbf6a9d28528c5;p=thirdparty%2Futil-linux.git

write: don't use strftime()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/term-utils/write.c b/term-utils/write.c
index 6bd393441e..e39b848eae 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -244,7 +244,7 @@ static void write_line(char *s)
  */
 static void do_write(const struct write_control *ctl)
 {
-	char *login, *pwuid, timestamp[6];
+	char *login, *pwuid;
 	struct passwd *pwd;
 	time_t now;
 	struct tm *tm;
@@ -274,15 +274,16 @@ static void do_write(const struct write_control *ctl)
 
 	now = time((time_t *)NULL);
 	tm = localtime(&now);
-	strftime(timestamp, sizeof(timestamp), "%H:%M", tm);
 	/* print greeting */
 	printf("\r\n\a\a\a");
 	if (strcmp(login, pwuid))
-		printf(_("Message from %s@%s (as %s) on %s at %s ..."),
-		       login, host, pwuid, ctl->src_tty_name, timestamp);
+		printf(_("Message from %s@%s (as %s) on %s at %02d:%02d ..."),
+		       login, host, pwuid, ctl->src_tty_name,
+		       tm->tm_hour, tm->tm_min);
 	else
-		printf(_("Message from %s@%s on %s at %s ..."),
-		       login, host, ctl->src_tty_name, timestamp);
+		printf(_("Message from %s@%s on %s at %02d:%02d ..."),
+		       login, host, ctl->src_tty_name,
+		       tm->tm_hour, tm->tm_min);
 	free(host);
 	printf("\r\n");