fix spurious errors in refactored passwd/group code

errno was treated as the error status when the return value of getline
was negative, but this condition can simply indicate EOF and is not
necessarily an error.

the spurious errors caused by this bug masked the bug which was fixed
in commit fc5a96c9c8aa186effad7520d5df6b616bbfd29d.

diff --git a/src/passwd/getgrent_a.c b/src/passwd/getgrent_a.c
index bafc9ed2f05f4b7668ded959fa03b84f0845dd33..ecd2f2eaf9c72dcaec2afa91aa2831d71c7cb9da 100644 (file)
--- a/src/passwd/getgrent_a.c
+++ b/src/passwd/getgrent_a.c
@@ -18,7 +18,7 @@ int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***m
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
        for (;;) {
                if ((l=getline(line, size, f)) < 0) {
-                       rv = errno;
+                       rv = ferror(f) ? errno : 0;
                        free(*line);
                        *line = 0;
                        gr = 0;

diff --git a/src/passwd/getpwent_a.c b/src/passwd/getpwent_a.c
index 4d84f0d55b78c5d97adcf3b6994047830f5b600e..d1b4b53ce2008234ea37a4e5cfe5e78f5456142f 100644 (file)
--- a/src/passwd/getpwent_a.c
+++ b/src/passwd/getpwent_a.c
@@ -17,7 +17,7 @@ int __getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size, struct p
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
        for (;;) {
                if ((l=getline(line, size, f)) < 0) {
-                       rv = errno;
+                       rv = ferror(f) ? errno : 0;
                        free(*line);
                        *line = 0;
                        pw = 0;