kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a few of the SunOS build errors in libarchive.

This commit is contained in:
Zach Mullen 2009-11-05 13:40:06 -05:00
parent dc577fb8b1
commit 5a6cb44e96
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c
View File

@ -186,7 +186,7 @@ static const char *
lookup_uname_helper(struct name_cache *cache, id_t id) lookup_uname_helper(struct name_cache *cache, id_t id)
{ {
struct passwd pwent, *result; struct passwd pwent, *result;
int r; int r = 0;
if (cache->buff_size == 0) { if (cache->buff_size == 0) {
cache->buff_size = 256; cache->buff_size = 256;
@ -195,8 +195,12 @@ lookup_uname_helper(struct name_cache *cache, id_t id)
if (cache->buff == NULL) if (cache->buff == NULL)
return (NULL); return (NULL);
for (;;) { for (;;) {
#if defined(__sun)
result = getpwuid_r((uid_t)id, &pwent, cache->buff, cache->buff_size);
#else
r = getpwuid_r((uid_t)id, &pwent, r = getpwuid_r((uid_t)id, &pwent,
cache->buff, cache->buff_size, &result); cache->buff, cache->buff_size, &result);
#endif
if (r == 0) if (r == 0)
break; break;
if (r != ERANGE) if (r != ERANGE)
@ -234,7 +238,7 @@ static const char *
lookup_gname_helper(struct name_cache *cache, id_t id) lookup_gname_helper(struct name_cache *cache, id_t id)
{ {
struct group grent, *result; struct group grent, *result;
int r; int r = 0;
if (cache->buff_size == 0) { if (cache->buff_size == 0) {
cache->buff_size = 256; cache->buff_size = 256;
@ -243,8 +247,12 @@ lookup_gname_helper(struct name_cache *cache, id_t id)
if (cache->buff == NULL) if (cache->buff == NULL)
return (NULL); return (NULL);
for (;;) { for (;;) {
#if defined(__sun)
result = getgrgid_r((gid_t)id, &grent, cache->buff, cache->buff_size);
#else
r = getgrgid_r((gid_t)id, &grent, r = getgrgid_r((gid_t)id, &grent,
cache->buff, cache->buff_size, &result); cache->buff, cache->buff_size, &result);
#endif
if (r == 0) if (r == 0)
break; break;
if (r != ERANGE) if (r != ERANGE)

12
Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c
View File

@ -122,10 +122,14 @@ lookup_gid(void *private_data, const char *gname, gid_t gid)
size_t bufsize = 128; size_t bufsize = 128;
char *buffer = _buffer; char *buffer = _buffer;
struct group grent, *result; struct group grent, *result;
int r; int r = 0;
for (;;) { for (;;) {
#if defined(__sun)
result = getgrnam_r(gname, &grent, buffer, bufsize);
#else
r = getgrnam_r(gname, &grent, buffer, bufsize, &result); r = getgrnam_r(gname, &grent, buffer, bufsize, &result);
#endif
if (r == 0) if (r == 0)
break; break;
if (r != ERANGE) if (r != ERANGE)
@ -181,10 +185,14 @@ lookup_uid(void *private_data, const char *uname, uid_t uid)
size_t bufsize = 128; size_t bufsize = 128;
char *buffer = _buffer; char *buffer = _buffer;
struct passwd pwent, *result; struct passwd pwent, *result;
int r; int r = 0;
for (;;) { for (;;) {
#if defined(__sun)
result = getpwnam_r(uname, &pwent, buffer, bufsize);
#else
r = getpwnam_r(uname, &pwent, buffer, bufsize, &result); r = getpwnam_r(uname, &pwent, buffer, bufsize, &result);
#endif
if (r == 0) if (r == 0)
break; break;
if (r != ERANGE) if (r != ERANGE)