mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 'lennart' branch back into trunk.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/pulse/util.c
View file

@ -26,7 +26,6 @@
#include <config.h>
#endif
#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
@ -56,20 +55,14 @@
#include <sys/prctl.h>
#endif
#include "../pulsecore/winsock.h"
#include <pulsecore/winsock.h>
#include <pulsecore/core-error.h>
#include <pulsecore/log.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
#include "util.h"
#ifndef OS_IS_WIN32
#define PATH_SEP '/'
#else
#define PATH_SEP '\\'
#endif
char *pa_get_user_name(char *s, size_t l) {
char *p;
char buf[1024];
@ -78,7 +71,8 @@ char *pa_get_user_name(char *s, size_t l) {
struct passwd pw, *r;
#endif
assert(s && l > 0);
pa_assert(s);
pa_assert(l > 0);
if (!(p = getenv("USER")) && !(p = getenv("LOGNAME")) && !(p = getenv("USERNAME"))) {
#ifdef HAVE_PWD_H
@ -90,7 +84,7 @@ char *pa_get_user_name(char *s, size_t l) {
* that do not support getpwuid_r. */
if ((r = getpwuid(getuid())) == NULL) {
#endif
snprintf(s, l, "%lu", (unsigned long) getuid());
pa_snprintf(s, l, "%lu", (unsigned long) getuid());
return s;
}
@ -113,11 +107,15 @@ char *pa_get_user_name(char *s, size_t l) {
}
char *pa_get_host_name(char *s, size_t l) {
assert(s && l > 0);
pa_assert(s);
pa_assert(l > 0);
if (gethostname(s, l) < 0) {
pa_log("gethostname(): %s", pa_cstrerror(errno));
return NULL;
}
s[l-1] = 0;
return s;
}
@ -130,7 +128,8 @@ char *pa_get_home_dir(char *s, size_t l) {
struct passwd pw, *r;
#endif
assert(s && l);
pa_assert(s);
pa_assert(l > 0);
if ((e = getenv("HOME")))
return pa_strlcpy(s, e, l);
@ -159,8 +158,8 @@ char *pa_get_home_dir(char *s, size_t l) {
char *pa_get_binary_name(char *s, size_t l) {
assert(s);
assert(l);
pa_assert(s);
pa_assert(l > 0);
#if defined(OS_IS_WIN32)
{
@ -171,7 +170,7 @@ char *pa_get_binary_name(char *s, size_t l) {
}
#endif
#ifdef HAVE_READLINK
#ifdef __linux__
{
int i;
char path[PATH_MAX];
@ -206,13 +205,15 @@ char *pa_get_binary_name(char *s, size_t l) {
return NULL;
}
const char *pa_path_get_filename(const char *p) {
char *pa_path_get_filename(const char *p) {
char *fn;
if ((fn = strrchr(p, PATH_SEP)))
pa_assert(p);
if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
return fn+1;
return (const char*) p;
return (char*) p;
}
char *pa_get_fqdn(char *s, size_t l) {
@ -221,6 +222,9 @@ char *pa_get_fqdn(char *s, size_t l) {
struct addrinfo *a, hints;
#endif
pa_assert(s);
pa_assert(l > 0);
if (!pa_get_host_name(hn, sizeof(hn)))
return NULL;