mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply Joe Marcus Clarke's FreeBSD patches

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@269 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-11-01 23:37:36 +00:00
parent 899788b4c5
commit cd3ba7d0f7
6 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
polyp/util.c
View file

@ -209,7 +209,13 @@ char *pa_get_user_name(char *s, size_t l) {
if (!(p = getenv("LOGNAME")))
if (!(p = getenv("USERNAME"))) {
#ifdef HAVE_GETPWUID_R
if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
#else
/* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X)
* that do not support getpwuid_r. */
if ((r = getpwuid(getuid())) == NULL) {
#endif
snprintf(s, l, "%lu", (unsigned long) getuid());
return s;
}
@ -445,11 +451,17 @@ int pa_parse_resample_method(const char *string) {
static int is_group(gid_t gid, const char *name) {
struct group group, *result = NULL;
long n = sysconf(_SC_GETGR_R_SIZE_MAX);
long n;
void *data;
int r = -1;
assert(n > 0);
#ifdef HAVE_GETGRGID_R
#ifdef _SC_GETGR_R_SIZE_MAX
n = sysconf(_SC_GETGR_R_SIZE_MAX);
#else
n = -1;
#endif
if (n < 0) n = 512;
data = pa_xmalloc(n);
if (getgrgid_r(gid, &group, data, n, &result) < 0 || !result) {
@ -462,6 +474,18 @@ static int is_group(gid_t gid, const char *name) {
finish:
pa_xfree(data);
#else
/* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X) that do not
* support getgrgid_r. */
if ((result = getgrgid(gid)) == NULL) {
pa_log(__FILE__ ": getgrgid(%u) failed: %s\n", gid, strerror(errno));
goto finish;
}
r = strcmp(name, result->gr_name) == 0;
finish:
#endif
return r;
}