From: Paul Eggert Date: Sat, 2 Sep 2017 10:56:06 +0000 (-0700) Subject: glob: fix getpwnam_r errno typo X-Git-Tag: v1.0~5961 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=5db93013208b0d041e1a8cd8d3838e721db3cf31;p=gnulib.git glob: fix getpwnam_r errno typo * lib/glob.c (glob): Fix longstanding misuse of errno after getpwnam_r, which returns an error number rather than setting errno. --- diff --git a/ChangeLog b/ChangeLog index 4dd0367e43..b5c3430ef3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-09-02 Paul Eggert + glob: fix getpwnam_r errno typo + * lib/glob.c (glob): Fix longstanding misuse of errno after + getpwnam_r, which returns an error number rather than setting + errno. + glob: fix typo in recent change * lib/glob.c (glob) [!HAVE_GETPWNAM_R && !_LIBC]: Fix recently-introduced typo. diff --git a/lib/glob.c b/lib/glob.c index f1b30ee461..7ca11361ec 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -644,13 +644,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), while (getpwnam_r (name, &pwbuf, pwtmpbuf.data, pwtmpbuf.length, &p) - != 0) + == ERANGE) { - if (errno != ERANGE) - { - p = NULL; - break; - } if (!scratch_buffer_grow (&pwtmpbuf)) { retval = GLOB_NOSPACE; @@ -815,13 +810,9 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), struct passwd pwbuf; while (getpwnam_r (user_name, &pwbuf, - pwtmpbuf.data, pwtmpbuf.length, &p) != 0) + pwtmpbuf.data, pwtmpbuf.length, &p) + == ERANGE) { - if (errno != ERANGE) - { - p = NULL; - break; - } if (!scratch_buffer_grow (&pwtmpbuf)) { retval = GLOB_NOSPACE;