d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use thread-safe getgrnam_r() and getpwnam_r(); dynamically size

Browse Source 
the buffer used by this.
This commit is contained in:
Tim Kientzle 2009-04-17 00:44:47 +00:00
parent 946733c26e
commit 5f8af33b11
1 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/libarchive/archive_write_disk_set_standard_lookup.c
View File

@ -118,12 +118,34 @@ lookup_gid(void *private_data, const char *gname, gid_t gid)
b->hash = h;
#if HAVE_GRP_H
{
struct group *grent = getgrnam(gname);
if (grent != NULL)
gid = grent->gr_gid;
char _buffer[128];
size_t bufsize = 128;
char *buffer = _buffer;
struct group grent, *result;
int r;
for (;;) {
r = getgrnam_r(gname, &grent, buffer, bufsize, &result);
if (r == 0)
break;
if (r != ERANGE)
break;
bufsize *= 2;
if (buffer != _buffer)
free(buffer);
buffer = malloc(bufsize);
if (buffer == NULL)
break;
}
if (result != NULL)
gid = result->gr_gid;
if (buffer != _buffer)
free(buffer);
}
#elif defined(_WIN32) && !defined(__CYGWIN__)
/* TODO: do a gname->gid lookup for Windows. */
#else
#error No way to perform gid lookups on this platform
#endif
b->id = gid;
@ -155,12 +177,34 @@ lookup_uid(void *private_data, const char *uname, uid_t uid)
b->hash = h;
#if HAVE_PWD_H
{
struct passwd *pwent = getpwnam(uname);
if (pwent != NULL)
uid = pwent->pw_uid;
char _buffer[128];
size_t bufsize = 128;
char *buffer = _buffer;
struct passwd pwent, *result;
int r;
for (;;) {
r = getpwnam_r(uname, &pwent, buffer, bufsize, &result);
if (r == 0)
break;
if (r != ERANGE)
break;
bufsize *= 2;
if (buffer != _buffer)
free(buffer);
buffer = malloc(bufsize);
if (buffer == NULL)
break;
}
if (result != NULL)
uid = result->pw_uid;
if (buffer != _buffer)
free(buffer);
}
#elif defined(_WIN32) && !defined(__CYGWIN__)
/* TODO: do a uname->uid lookup for Windows. */
#else
#error No way to look up uids on this platform
#endif
b->id = uid;