refactor group file access code

[musl] / src / passwd / putgrent.c

diff --git a/src/passwd/putgrent.c b/src/passwd/putgrent.c
index d7847b1..a0b320f 100644 (file)
--- a/src/passwd/putgrent.c
+++ b/src/passwd/putgrent.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <grp.h>
 #include <stdio.h>
 
@@ -6,9 +7,11 @@ int putgrent(const struct group *gr, FILE *f)
        int r;
        size_t i;
        flockfile(f);
-       r = fprintf(f, "%s:%s:%d:", gr->gr_name, gr->gr_passwd, gr->gr_gid);
+       if ((r = fprintf(f, "%s:%s:%d:", gr->gr_name, gr->gr_passwd, gr->gr_gid))<0) goto done;
        if (gr->gr_mem) for (i=0; gr->gr_mem[i]; i++)
-               if (fprintf(f, "%s%s", i?",":"", gr->gr_mem[i])<0) r = -1;
+               if ((r = fprintf(f, "%s%s", i?",":"", gr->gr_mem[i]))<0) goto done;
+       r = fputc('\n', f);
+done:
        funlockfile(f);
        return r<0 ? -1 : 0;
 }