diff options
| -rw-r--r-- | support/support_process_state.c | 2 | ||||
| -rw-r--r-- | support/xgetline.c | 22 | ||||
| -rw-r--r-- | support/xstdio.h | 5 |
3 files changed, 19 insertions, 10 deletions
diff --git a/support/support_process_state.c b/support/support_process_state.c index 76dc798728..e303c78fc8 100644 --- a/support/support_process_state.c +++ b/support/support_process_state.c @@ -59,7 +59,7 @@ support_process_state_wait (pid_t pid, enum support_process_state state) for (;;) { char cur_state = -1; - while (xgetline (&line, &linesiz, fstatus) != -1) + while (xgetline (&line, &linesiz, fstatus) > 0) if (strncmp (line, "State:", strlen ("State:")) == 0) { TEST_COMPARE (sscanf (line, "%*s %c", &cur_state), 1); diff --git a/support/xgetline.c b/support/xgetline.c index 180bc2db95..d91c09ac10 100644 --- a/support/xgetline.c +++ b/support/xgetline.c @@ -18,16 +18,22 @@ #include <support/xstdio.h> #include <support/check.h> -#include <errno.h> -ssize_t +size_t xgetline (char **lineptr, size_t *n, FILE *stream) { - int old_errno = errno; - errno = 0; - size_t ret = getline (lineptr, n, stream); - if (!feof (stream) && ferror (stream)) - FAIL_EXIT1 ("getline failed: %m"); - errno = old_errno; + TEST_VERIFY (!ferror (stream)); + ssize_t ret = getline (lineptr, n, stream); + if (ferror (stream)) + { + TEST_VERIFY (ret < 0); + FAIL_EXIT1 ("getline: %m"); + } + if (feof (stream)) + { + TEST_VERIFY (ret <= 0); + return 0; + } + TEST_VERIFY (ret > 0); return ret; } diff --git a/support/xstdio.h b/support/xstdio.h index 143957b6a8..807c3afc43 100644 --- a/support/xstdio.h +++ b/support/xstdio.h @@ -27,7 +27,10 @@ __BEGIN_DECLS FILE *xfopen (const char *path, const char *mode); void xfclose (FILE *); -ssize_t xgetline (char **lineptr, size_t *n, FILE *stream); +/* Read a line from FP, using getline. *BUFFER must be NULL, or a + heap-allocated pointer of *LENGTH bytes. Return the number of + bytes in the line if a line was read, or 0 on EOF. */ +size_t xgetline (char **lineptr, size_t *n, FILE *stream); __END_DECLS |