summaryrefslogtreecommitdiffstats
path: root/src/pulse/util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-10-28 19:13:50 +0000
committerLennart Poettering <lennart@poettering.net>2007-10-28 19:13:50 +0000
commita67c21f093202f142438689d3f7cfbdf4ea82eea (patch)
tree5c3295037f033904bc11ab8b3adae5b7331101e9 /src/pulse/util.c
parent6687dd013169fd8436aa1b45ccdacff074a40d05 (diff)
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulse/util.c')
-rw-r--r--src/pulse/util.c42
1 files changed, 23 insertions, 19 deletions
diff --git a/src/pulse/util.c b/src/pulse/util.c
index d561329c..5dbb670b 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -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;