#include <config.h>
-#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
uid_t u;
gid_t g;
} id;
+ char *name;
struct userid *next;
- char name[FLEXIBLE_ARRAY_MEMBER];
};
static struct userid *user_alist;
{
register struct userid *tail;
struct passwd *pwent;
- char const *name;
for (tail = user_alist; tail; tail = tail->next)
if (tail->id.u == uid)
return tail->name;
pwent = getpwuid (uid);
- name = pwent ? pwent->pw_name : "";
- tail = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
+ tail = xmalloc (sizeof *tail);
tail->id.u = uid;
- strcpy (tail->name, name);
+ tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;
/* Add to the head of the list, so most recently used is first. */
tail->next = user_alist;
}
#endif
- tail = xmalloc (offsetof (struct userid, name) + strlen (user) + 1);
- strcpy (tail->name, user);
+ tail = xmalloc (sizeof *tail);
+ tail->name = xstrdup (user);
/* Add to the head of the list, so most recently used is first. */
if (pwent)
{
register struct userid *tail;
struct group *grent;
- char const *name;
for (tail = group_alist; tail; tail = tail->next)
if (tail->id.g == gid)
return tail->name;
grent = getgrgid (gid);
- name = grent ? grent->gr_name : NULL;
- tail = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
+ tail = xmalloc (sizeof *tail);
tail->id.g = gid;
- strcpy (tail->name, name);
+ tail->name = grent ? xstrdup (grent->gr_name) : NULL;
/* Add to the head of the list, so most recently used is first. */
tail->next = group_alist;
}
#endif
- tail = xmalloc (offsetof (struct userid, name) + strlen (group) + 1);
- strcpy (tail->name, group);
+ tail = xmalloc (sizeof *tail);
+ tail->name = xstrdup (group);
/* Add to the head of the list, so most recently used is first. */
if (grent)