diff options
| author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-01-06 00:51:33 +0100 |
|---|---|---|
| committer | Maarten Bosmans <mkbosmans@gmail.com> | 2011-02-17 11:58:22 +0100 |
| commit | bb12ff83564d43566089dd979639c6993ba76665 (patch) | |
| tree | 1d7df88762eeba464971742328b7617ffb93f3b3 /src/pulse | |
| parent | 0ac0479534d9cb6e4ef734eeb3a663f33a4f8ef3 (diff) | |
Apply #ifdefs around functionality not available on win32
And also the reverse: around some win32 specific functionality
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/context.c | 6 | ||||
| -rw-r--r-- | src/pulse/util.c | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index ca816507..8f632b5d 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -585,10 +585,12 @@ static char *get_old_legacy_runtime_dir(void) { return NULL; } +#ifdef HAVE_GETUID if (st.st_uid != getuid()) { pa_xfree(p); return NULL; } +#endif return p; } @@ -607,10 +609,12 @@ static char *get_very_old_legacy_runtime_dir(void) { return NULL; } +#ifdef HAVE_GETUID if (st.st_uid != getuid()) { pa_xfree(p); return NULL; } +#endif return p; } @@ -997,6 +1001,7 @@ int pa_context_connect( /* Set up autospawning */ if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) { +#ifdef HAVE_GETUID if (getuid() == 0) pa_log_debug("Not doing autospawn since we are root."); else { @@ -1005,6 +1010,7 @@ int pa_context_connect( if (api) c->spawn_api = *api; } +#endif } pa_context_set_state(c, PA_CONTEXT_CONNECTING); diff --git a/src/pulse/util.c b/src/pulse/util.c index 3206e94c..c5cfc8ca 100644 --- a/src/pulse/util.c +++ b/src/pulse/util.c @@ -75,11 +75,15 @@ char *pa_get_user_name(char *s, size_t l) { pa_assert(s); pa_assert(l > 0); - if ((p = (getuid() == 0 ? "root" : NULL)) || - (p = getenv("USER")) || - (p = getenv("LOGNAME")) || - (p = getenv("USERNAME"))) - { + p = NULL; +#ifdef HAVE_GETUID + p = getuid() == 0 ? "root" : NULL; +#endif + if (!p) p = getenv("USER"); + if (!p) p = getenv("LOGNAME"); + if (!p) p = getenv("USERNAME"); + + if (p) { name = pa_strlcpy(s, p, l); } else { #ifdef HAVE_PWD_H |