[Cmake-commits] [cmake-commits] zach.mullen committed archive_read_disk_set_standard_lookup.c 1.1 1.2 archive_write_disk_set_standard_lookup.c 1.1 1.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Nov 5 13:40:09 EST 2009
Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive
In directory public:/mounts/ram/cvs-serv9180
Modified Files:
archive_read_disk_set_standard_lookup.c
archive_write_disk_set_standard_lookup.c
Log Message:
Fixed a few of the SunOS build errors in libarchive.
Index: archive_read_disk_set_standard_lookup.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_read_disk_set_standard_lookup.c 30 Oct 2009 17:09:56 -0000 1.1
--- archive_read_disk_set_standard_lookup.c 5 Nov 2009 18:40:06 -0000 1.2
***************
*** 187,191 ****
{
struct passwd pwent, *result;
! int r;
if (cache->buff_size == 0) {
--- 187,191 ----
{
struct passwd pwent, *result;
! int r = 0;
if (cache->buff_size == 0) {
***************
*** 196,201 ****
--- 196,205 ----
return (NULL);
for (;;) {
+ #if defined(__sun)
+ result = getpwuid_r((uid_t)id, &pwent, cache->buff, cache->buff_size);
+ #else
r = getpwuid_r((uid_t)id, &pwent,
cache->buff, cache->buff_size, &result);
+ #endif
if (r == 0)
break;
***************
*** 235,239 ****
{
struct group grent, *result;
! int r;
if (cache->buff_size == 0) {
--- 239,243 ----
{
struct group grent, *result;
! int r = 0;
if (cache->buff_size == 0) {
***************
*** 244,249 ****
--- 248,257 ----
return (NULL);
for (;;) {
+ #if defined(__sun)
+ result = getgrgid_r((gid_t)id, &grent, cache->buff, cache->buff_size);
+ #else
r = getgrgid_r((gid_t)id, &grent,
cache->buff, cache->buff_size, &result);
+ #endif
if (r == 0)
break;
Index: archive_write_disk_set_standard_lookup.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_write_disk_set_standard_lookup.c 30 Oct 2009 17:09:59 -0000 1.1
--- archive_write_disk_set_standard_lookup.c 5 Nov 2009 18:40:06 -0000 1.2
***************
*** 123,130 ****
char *buffer = _buffer;
struct group grent, *result;
! int r;
for (;;) {
r = getgrnam_r(gname, &grent, buffer, bufsize, &result);
if (r == 0)
break;
--- 123,134 ----
char *buffer = _buffer;
struct group grent, *result;
! int r = 0;
for (;;) {
+ #if defined(__sun)
+ result = getgrnam_r(gname, &grent, buffer, bufsize);
+ #else
r = getgrnam_r(gname, &grent, buffer, bufsize, &result);
+ #endif
if (r == 0)
break;
***************
*** 182,189 ****
char *buffer = _buffer;
struct passwd pwent, *result;
! int r;
for (;;) {
r = getpwnam_r(uname, &pwent, buffer, bufsize, &result);
if (r == 0)
break;
--- 186,197 ----
char *buffer = _buffer;
struct passwd pwent, *result;
! int r = 0;
for (;;) {
+ #if defined(__sun)
+ result = getpwnam_r(uname, &pwent, buffer, bufsize);
+ #else
r = getpwnam_r(uname, &pwent, buffer, bufsize, &result);
+ #endif
if (r == 0)
break;
More information about the Cmake-commits
mailing list