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
This commit is contained in:
Paul Eggert committed 2018-05-14 13:49:58 -07:00
1 parent ea7ae28b10
commit f6cb50cc99
1 file changed
+5 -8
+5 -8
View File
@@ -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;
}