diff options
Diffstat (limited to 'ports/uids_generic')
-rw-r--r-- | ports/uids_generic/guts/getgrent.c | 26 | ||||
-rw-r--r-- | ports/uids_generic/guts/getgrgid.c | 26 | ||||
-rw-r--r-- | ports/uids_generic/guts/getgrnam.c | 25 |
3 files changed, 68 insertions, 9 deletions
diff --git a/ports/uids_generic/guts/getgrent.c b/ports/uids_generic/guts/getgrent.c index e8e07f5..d6592e6 100644 --- a/ports/uids_generic/guts/getgrent.c +++ b/ports/uids_generic/guts/getgrent.c @@ -7,10 +7,30 @@ * struct group * rc = NULL; */ static struct group grp; - static char grbuf[PSEUDO_PWD_MAX]; - int r_rc; + static size_t grbuflen = PSEUDO_PWD_MAX; + static char *grbuf = NULL; + int r_rc = ERANGE; + + do { + char *new_grbuf = grbuf; + + if (r_rc == ERANGE) + new_grbuf = realloc(grbuf, grbuflen); + + if (!new_grbuf) { + r_rc = ENOMEM; + break; + } + + grbuf = new_grbuf; + + r_rc = wrap_getgrent_r(&grp, grbuf, grbuflen, &rc); + + if (r_rc == ERANGE) + grbuflen = grbuflen << 1; + + } while (r_rc == ERANGE); - r_rc = wrap_getgrent_r(&grp, grbuf, PSEUDO_PWD_MAX, &rc); /* different error return conventions */ if (r_rc != 0) { errno = r_rc; diff --git a/ports/uids_generic/guts/getgrgid.c b/ports/uids_generic/guts/getgrgid.c index c1824e7..0d3dafb 100644 --- a/ports/uids_generic/guts/getgrgid.c +++ b/ports/uids_generic/guts/getgrgid.c @@ -7,10 +7,30 @@ * struct group * rc = NULL; */ static struct group grp; - static char grbuf[PSEUDO_PWD_MAX]; - int r_rc; + static size_t grbuflen = PSEUDO_PWD_MAX; + static char *grbuf = NULL; + int r_rc = ERANGE; + + do { + char *new_grbuf = grbuf; + + if (r_rc == ERANGE) + new_grbuf = realloc(grbuf, grbuflen); + + if (!new_grbuf) { + r_rc = ENOMEM; + break; + } + + grbuf = new_grbuf; + + r_rc = wrap_getgrgid_r(gid, &grp, grbuf, grbuflen, &rc); + + if (r_rc == ERANGE) + grbuflen = grbuflen << 1; + + } while (r_rc == ERANGE); - r_rc = wrap_getgrgid_r(gid, &grp, grbuf, PSEUDO_PWD_MAX, &rc); /* different error return conventions */ if (r_rc != 0) { errno = r_rc; diff --git a/ports/uids_generic/guts/getgrnam.c b/ports/uids_generic/guts/getgrnam.c index 0e26444..19006ad 100644 --- a/ports/uids_generic/guts/getgrnam.c +++ b/ports/uids_generic/guts/getgrnam.c @@ -8,10 +8,29 @@ */ static struct group grp; - static char grbuf[PSEUDO_PWD_MAX]; - int r_rc; + static size_t grbufsz = PSEUDO_PWD_MAX; + static char *grbuf = NULL; + int r_rc = ERANGE; + + do { + char *new_grbuf = grbuf; + + if (r_rc != 0) + new_grbuf = realloc(grbuf, grbufsz); + + if (!new_grbuf) { + r_rc = ENOMEM; + break; + } + + grbuf = new_grbuf; + + r_rc = wrap_getgrnam_r(name, &grp, grbuf, grbufsz, &rc); + + if (r_rc == ERANGE) + grbufsz = grbufsz << 1; + } while (r_rc == ERANGE); - r_rc = wrap_getgrnam_r(name, &grp, grbuf, PSEUDO_PWD_MAX, &rc); /* different error return conventions */ if (r_rc != 0) { errno = r_rc; |