d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libutil: utilize strsep instead of strcat in a loop in gr_make

Browse Source 
Submitted by:	Christoph Mallon <christoph.mallon gmx.de>
This commit is contained in:
Mateusz Guzik 2013-01-13 21:28:47 +00:00
parent fe75b0f0e5
commit 49013fb476
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libutil/gr_util.c
View File

@ -390,7 +390,9 @@ char *
gr_make(const struct group *gr)
{
const char *group_line_format = "%s:%s:%ju:";
const char *sep;
char *line;
char *p;
size_t line_size;
int ndx;
@ -405,16 +407,18 @@ gr_make(const struct group *gr)
}
/* Create the group line and fill it. */
if ((line = malloc(line_size)) == NULL)
if ((line = p = malloc(line_size)) == NULL)
return (NULL);
snprintf(line, line_size, group_line_format, gr->gr_name, gr->gr_passwd,
p += sprintf(p, group_line_format, gr->gr_name, gr->gr_passwd,
(uintmax_t)gr->gr_gid);
if (gr->gr_mem != NULL)
if (gr->gr_mem != NULL) {
sep = "";
for (ndx = 0; gr->gr_mem[ndx] != NULL; ndx++) {
strcat(line, gr->gr_mem[ndx]);
if (gr->gr_mem[ndx + 1] != NULL)
strcat(line, ",");
p = stpcpy(p, sep);
p = stpcpy(p, gr->gr_mem[ndx]);
sep = ",";
}
}
return (line);
}