qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 06:00:08 -07:00
Code Releases Activity

os/user: small fixes for Solaris

Browse Source 
Change-Id: I56149ef6607fb4d9baff9047cb3a47d71cad6fa6
Reviewed-on: https://go-review.googlesource.com/8261
Reviewed-by: Minux Ma <minux@golang.org>
This commit is contained in:
Aram Hăvărneanu 2015-03-30 23:06:06 +02:00
parent 121489cbfd
commit 24396dae67
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os/user/lookup_unix.go
View File

@ -17,6 +17,7 @@ import (
) )
/* /*
#cgo solaris CFLAGS: -D_POSIX_PTHREAD_SEMANTICS
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
@ -24,7 +25,12 @@ import (
static int mygetpwuid_r(int uid, struct passwd *pwd, static int mygetpwuid_r(int uid, struct passwd *pwd,
char *buf, size_t buflen, struct passwd **result) { char *buf, size_t buflen, struct passwd **result) {
return getpwuid_r(uid, pwd, buf, buflen, result); return getpwuid_r(uid, pwd, buf, buflen, result);
}
static int mygetpwnam_r(const char *name, struct passwd *pwd,
char *buf, size_t buflen, struct passwd **result) {
return getpwnam_r(name, pwd, buf, buflen, result);
} }
*/ */
import "C" import "C"
@ -67,7 +73,11 @@ func lookupUnix(uid int, username string, lookupByName bool) (*User, error) {
if lookupByName { if lookupByName {
nameC := C.CString(username) nameC := C.CString(username)
defer C.free(unsafe.Pointer(nameC)) defer C.free(unsafe.Pointer(nameC))
rv = C.getpwnam_r(nameC, // mygetpwnam_r is a wrapper around getpwnam_r to avoid
// passing a size_t to getpwnam_r, because for unknown
// reasons passing a size_t to getpwnam_r doesn't work on
// Solaris.
rv = C.mygetpwnam_r(nameC,
&pwd, &pwd,
(*C.char)(buf), (*C.char)(buf),
C.size_t(bufSize), C.size_t(bufSize),