From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 14 May 2018 20:49:35 +0000 (-0700)
Subject: who: simplify port to GCC 8
X-Git-Tag: v8.30~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6cb50cc991d461f443ea3afc517c9e1e37ef496;p=thirdparty%2Fcoreutils.git

who: simplify port to GCC 8

* src/who.c (make_id_equals_comment): Use simpler workaround
for GCC bug 85602.  Suggested by Martin Sebor in:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85602#c3
---

diff --git a/src/who.c b/src/who.c
index 3719baec58..1bfe4f11d5 100644
--- a/src/who.c
+++ b/src/who.c
@@ -447,14 +447,11 @@ print_boottime (const STRUCT_UTMP *utmp_ent)
 static char *
 make_id_equals_comment (STRUCT_UTMP const *utmp_ent)
 {
-  char const *ideq = _("id=");
-  char const *ut_id = UT_ID (utmp_ent);
-  size_t ideqlen = strlen (ideq);
-  size_t ut_idlen = strnlen (ut_id, sizeof UT_ID (utmp_ent));
-  char *comment = xmalloc (ideqlen + ut_idlen + 1);
-  char *rhs = mempcpy (comment, ideq, ideqlen);
-  char *z = mempcpy (rhs, ut_id, ut_idlen);
-  *z = '\0';
+  size_t utmpsize = sizeof UT_ID (utmp_ent);
+  char *comment = xmalloc (strlen (_("id=")) + utmpsize + 1);
+
+  strcpy (comment, _("id="));
+  strncat (comment, UT_ID (utmp_ent), utmpsize);
   return comment;
 }