25 files changed, 31 insertions, 328 deletions

diff --git a/src/polypcore/authkey.c b/src/polypcore/authkey.c
index 6eafb672..1231c7a2 100644
--- a/src/polypcore/authkey.c
+++ b/src/polypcore/authkey.c
@@ -35,7 +35,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/random.h>
 
diff --git a/src/polypcore/cli-command.c b/src/polypcore/cli-command.c
index 5556bcb3..3adc9a21 100644
--- a/src/polypcore/cli-command.c
+++ b/src/polypcore/cli-command.c
@@ -48,7 +48,7 @@
 #include <polypcore/autoload.h>
 #include <polypcore/sound-file-stream.h>
 #include <polypcore/props.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "cli-command.h"
 
diff --git a/src/polypcore/conf-parser.c b/src/polypcore/conf-parser.c
index 64e66c2e..bc99b871 100644
--- a/src/polypcore/conf-parser.c
+++ b/src/polypcore/conf-parser.c
@@ -31,7 +31,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "conf-parser.h"
 
diff --git a/src/polypcore/core-scache.c b/src/polypcore/core-scache.c
index 8080fcd6..068f2361 100644
--- a/src/polypcore/core-scache.c
+++ b/src/polypcore/core-scache.c
@@ -52,7 +52,7 @@
 #include <polypcore/core-subscribe.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sound-file.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "core-scache.h"
diff --git a/src/polypcore/util.c b/src/polypcore/core-util.c
index 9783b746..36044c81 100644
--- a/src/polypcore/util.c
+++ b/src/polypcore/core-util.c
@@ -59,22 +59,23 @@
 #include <windows.h>
 #endif
 
-#include <samplerate.h>
-
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
+
 #ifdef HAVE_GRP_H
 #include <grp.h>
 #endif
 
-#include "winsock.h"
+#include <samplerate.h>
 
 #include <polyp/xmalloc.h>
+#include <polyp/util.h>
 
+#include <polypcore/winsock.h>
 #include <polypcore/log.h>
 
-#include "util.h"
+#include "core-util.h"
 
 #ifndef OS_IS_WIN32
 #define PA_RUNTIME_PATH_PREFIX "/tmp/polypaudio-"
@@ -377,96 +378,6 @@ char *pa_vsprintf_malloc(const char *format, va_list ap) {
     }
 }
 
-/* Return the current username in the specified string buffer. */
-char *pa_get_user_name(char *s, size_t l) {
-    char *p;
-    char buf[1024];
-
-#ifdef HAVE_PWD_H
-    struct passwd pw, *r;
-#endif
-
-    assert(s && l > 0);
-
-    if (!(p = getenv("USER")) && !(p = getenv("LOGNAME")) && !(p = getenv("USERNAME"))) {
-#ifdef HAVE_PWD_H
-        
-#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;
-        }
-        
-        p = r->pw_name;
-
-#elif defined(OS_IS_WIN32) /* HAVE_PWD_H */
-        DWORD size = sizeof(buf);
-
-        if (!GetUserName(buf, &size))
-            return NULL;
-
-        p = buf;
-
-#else /* HAVE_PWD_H */
-        return NULL;
-#endif /* HAVE_PWD_H */
-    }
-
-    return pa_strlcpy(s, p, l);
-}
-
-/* Return the current hostname in the specified buffer. */
-char *pa_get_host_name(char *s, size_t l) {
-    assert(s && l > 0);
-    if (gethostname(s, l) < 0) {
-        pa_log(__FILE__": gethostname(): %s", strerror(errno));
-        return NULL;
-    }
-    s[l-1] = 0;
-    return s;
-}
-
-/* Return the home directory of the current user */
-char *pa_get_home_dir(char *s, size_t l) {
-    char *e;
-
-#ifdef HAVE_PWD_H
-    char buf[1024];
-    struct passwd pw, *r;
-#endif
-
-    assert(s && l);
-
-    if ((e = getenv("HOME")))
-        return pa_strlcpy(s, e, l);
-
-    if ((e = getenv("USERPROFILE")))
-        return pa_strlcpy(s, e, l);
-
-#ifdef HAVE_PWD_H
-#ifdef HAVE_GETPWUID_R
-    if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
-        pa_log(__FILE__": getpwuid_r() failed");
-#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) {
-        pa_log(__FILE__": getpwuid_r() failed");
-#endif
-        return NULL;
-    }
-
-    return pa_strlcpy(s, r->pw_dir, l);
-#else /* HAVE_PWD_H */
-    return NULL;
-#endif
-}
-
 /* Similar to OpenBSD's strlcpy() function */
 char *pa_strlcpy(char *b, const char *s, size_t l) {
     assert(b && s && l > 0);
@@ -476,115 +387,6 @@ char *pa_strlcpy(char *b, const char *s, size_t l) {
     return b;
 }
 
-struct timeval *pa_gettimeofday(struct timeval *tv) {
-#ifdef HAVE_GETTIMEOFDAY
-    assert(tv);
-    
-    return gettimeofday(tv, NULL) < 0 ? NULL : tv;
-#elif defined(OS_IS_WIN32)
-    /*
-     * Copied from implementation by Steven Edwards (LGPL).
-     * Found on wine mailing list.
-     */
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define EPOCHFILETIME (116444736000000000i64)
-#else
-#define EPOCHFILETIME (116444736000000000LL)
-#endif
-
-    FILETIME        ft;
-    LARGE_INTEGER   li;
-    __int64         t;
-
-    assert(tv);
-
-    GetSystemTimeAsFileTime(&ft);
-    li.LowPart  = ft.dwLowDateTime;
-    li.HighPart = ft.dwHighDateTime;
-    t  = li.QuadPart;       /* In 100-nanosecond intervals */
-    t -= EPOCHFILETIME;     /* Offset to the Epoch time */
-    t /= 10;                /* In microseconds */
-    tv->tv_sec  = (long)(t / 1000000);
-    tv->tv_usec = (long)(t % 1000000);
-
-    return tv;
-#else
-#error "Platform lacks gettimeofday() or equivalent function."
-#endif
-}
-
-/* Calculate the difference between the two specfified timeval
- * timestamsps. */
-pa_usec_t pa_timeval_diff(const struct timeval *a, const struct timeval *b) {
-    pa_usec_t r;
-    assert(a && b);
-
-    /* Check which whan is the earlier time and swap the two arguments if reuqired. */
-    if (pa_timeval_cmp(a, b) < 0) {
-        const struct timeval *c;
-        c = a;
-        a = b;
-        b = c;
-    }
-
-    /* Calculate the second difference*/
-    r = ((pa_usec_t) a->tv_sec - b->tv_sec)* 1000000;
-
-    /* Calculate the microsecond difference */
-    if (a->tv_usec > b->tv_usec)
-        r += ((pa_usec_t) a->tv_usec - b->tv_usec);
-    else if (a->tv_usec < b->tv_usec)
-        r -= ((pa_usec_t) b->tv_usec - a->tv_usec);
-
-    return r;
-}
-
-/* Compare the two timeval structs and return 0 when equal, negative when a < b, positive otherwse */
-int pa_timeval_cmp(const struct timeval *a, const struct timeval *b) {
-    assert(a && b);
-
-    if (a->tv_sec < b->tv_sec)
-        return -1;
-
-    if (a->tv_sec > b->tv_sec)
-        return 1;
-
-    if (a->tv_usec < b->tv_usec)
-        return -1;
-
-    if (a->tv_usec > b->tv_usec)
-        return 1;
-
-    return 0;
-}
-
-/* Return the time difference between now and the specified timestamp */
-pa_usec_t pa_timeval_age(const struct timeval *tv) {
-    struct timeval now;
-    assert(tv);
-    
-    return pa_timeval_diff(pa_gettimeofday(&now), tv);
-}
-
-/* Add the specified time inmicroseconds to the specified timeval structure */
-void pa_timeval_add(struct timeval *tv, pa_usec_t v) {
-    unsigned long secs;
-    assert(tv);
-    
-    secs = (v/1000000);
-    tv->tv_sec += (unsigned long) secs;
-    v -= secs*1000000;
-
-    tv->tv_usec += v;
-
-    /* Normalize */
-    while (tv->tv_usec >= 1000000) {
-        tv->tv_sec++;
-        tv->tv_usec -= 1000000;
-    }
-}
-
 #define NICE_LEVEL (-15)
 
 /* Raise the priority of the current process as much as possible and
@@ -665,46 +467,6 @@ int pa_fd_set_cloexec(int fd, int b) {
     return 0;
 }
 
-/* Return the binary file name of the current process. Works on Linux
- * only. This shoul be used for eyecandy only, don't rely on return
- * non-NULL! */
-char *pa_get_binary_name(char *s, size_t l) {
-
-#ifdef HAVE_READLINK
-    char path[PATH_MAX];
-    int i;
-    assert(s && l);
-
-    /* This works on Linux only */
-    
-    snprintf(path, sizeof(path), "/proc/%u/exe", (unsigned) getpid());
-    if ((i = readlink(path, s, l-1)) < 0)
-        return NULL;
-
-    s[i] = 0;
-    return s;
-#elif defined(OS_IS_WIN32)
-    char path[PATH_MAX];
-    if (!GetModuleFileName(NULL, path, PATH_MAX))
-        return NULL;
-    pa_strlcpy(s, pa_path_get_filename(path), l);
-    return s;
-#else
-    return NULL;
-#endif
-}
-
-/* Return a pointer to the filename inside a path (which is the last
- * component). */
-const char *pa_path_get_filename(const char *p) {
-    char *fn;
-
-    if ((fn = strrchr(p, PATH_SEP)))
-        return fn+1;
-
-    return (const char*) p;
-}
-
 /* Try to parse a boolean string value.*/
 int pa_parse_boolean(const char *v) {
     
@@ -1163,32 +925,6 @@ size_t pa_parsehex(const char *p, uint8_t *d, size_t dlength) {
     return j;
 }
 
-/* Return the fully qualified domain name in *s */
-char *pa_get_fqdn(char *s, size_t l) {
-    char hn[256];
-#ifdef HAVE_GETADDRINFO    
-    struct addrinfo *a, hints;
-#endif
-
-    if (!pa_get_host_name(hn, sizeof(hn)))
-        return NULL;
-
-#ifdef HAVE_GETADDRINFO
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_flags = AI_CANONNAME;
-    
-    if (getaddrinfo(hn, NULL, &hints, &a) < 0 || !a || !a->ai_canonname || !*a->ai_canonname)
-        return pa_strlcpy(s, hn, l);
-
-    pa_strlcpy(s, a->ai_canonname, l);
-    freeaddrinfo(a);
-    return s;
-#else
-    return pa_strlcpy(s, hn, l);
-#endif
-}
-
 /* Returns nonzero when *s starts with *pfx */
 int pa_startswith(const char *s, const char *pfx) {
     size_t l;
@@ -1243,23 +979,6 @@ char *pa_runtime_path(const char *fn, char *s, size_t l) {
     return s;
 }
 
-/* Wait t milliseconds */
-int pa_msleep(unsigned long t) {
-#ifdef OS_IS_WIN32
-    Sleep(t);
-    return 0;
-#elif defined(HAVE_NANOSLEEP)
-    struct timespec ts;
-
-    ts.tv_sec = t/1000;
-    ts.tv_nsec = (t % 1000) * 1000000;
-
-    return nanosleep(&ts, NULL);
-#else
-#error "Platform lacks a sleep function."
-#endif
-}
-
 /* Convert the string s to a signed integer in *ret_i */
 int pa_atoi(const char *s, int32_t *ret_i) {
     char *x = NULL;
diff --git a/src/polypcore/util.h b/src/polypcore/core-util.h
index df71672f..d3db756f 100644
--- a/src/polypcore/util.h
+++ b/src/polypcore/core-util.h
@@ -1,5 +1,5 @@
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#ifndef foocoreutilhfoo
+#define foocoreutilhfoo
 
 /* $Id$ */
 
@@ -27,8 +27,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <polyp/sample.h>
 #include <polypcore/gccmacro.h>
+#include <polyp/util.h>
 
 struct timeval;
 
@@ -49,22 +49,8 @@ char *pa_vsprintf_malloc(const char *format, va_list ap);
 
 char *pa_strlcpy(char *b, const char *s, size_t l);
 
-char *pa_get_user_name(char *s, size_t l);
-char *pa_get_host_name(char *s, size_t l);
-char *pa_get_fqdn(char *s, size_t l);
-char *pa_get_binary_name(char *s, size_t l);
-char *pa_get_home_dir(char *s, size_t l);
-
-const char *pa_path_get_filename(const char *p);
-
 char *pa_parent_dir(const char *fn);
 
-struct timeval *pa_gettimeofday(struct timeval *tv);
-pa_usec_t pa_timeval_diff(const struct timeval *a, const struct timeval *b);
-int pa_timeval_cmp(const struct timeval *a, const struct timeval *b);
-pa_usec_t pa_timeval_age(const struct timeval *tv);
-void pa_timeval_add(struct timeval *tv, pa_usec_t v);
-
 void pa_raise_priority(void);
 void pa_reset_priority(void);
 
@@ -97,8 +83,6 @@ int pa_endswith(const char *s, const char *sfx);
 
 char *pa_runtime_path(const char *fn, char *s, size_t l);
 
-int pa_msleep(unsigned long t);
-
 int pa_atoi(const char *s, int32_t *ret_i);
 int pa_atou(const char *s, uint32_t *ret_u);
 
diff --git a/src/polypcore/core.c b/src/polypcore/core.c
index ff8ec081..43f7015e 100644
--- a/src/polypcore/core.c
+++ b/src/polypcore/core.c
@@ -34,7 +34,7 @@
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
 #include <polypcore/namereg.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/autoload.h>
 #include <polypcore/core-subscribe.h>
diff --git a/src/polypcore/iochannel.c b/src/polypcore/iochannel.c
index a1ad5dea..b953a1d0 100644
--- a/src/polypcore/iochannel.c
+++ b/src/polypcore/iochannel.c
@@ -40,7 +40,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/socket-util.h>
 #include <polypcore/log.h>
 
diff --git a/src/polypcore/log.c b/src/polypcore/log.c
index 9908d168..3f5dfa08 100644
--- a/src/polypcore/log.c
+++ b/src/polypcore/log.c
@@ -35,7 +35,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "log.h"
 
diff --git a/src/polypcore/modargs.c b/src/polypcore/modargs.c
index 63cc779d..5d046d26 100644
--- a/src/polypcore/modargs.c
+++ b/src/polypcore/modargs.c
@@ -36,7 +36,7 @@
 #include <polypcore/namereg.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "modargs.h"
 
diff --git a/src/polypcore/modinfo.c b/src/polypcore/modinfo.c
index 241076c6..4a9be0f0 100644
--- a/src/polypcore/modinfo.c
+++ b/src/polypcore/modinfo.c
@@ -28,7 +28,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "modinfo.h"
diff --git a/src/polypcore/module.c b/src/polypcore/module.c
index fe177a5b..52cde9c3 100644
--- a/src/polypcore/module.c
+++ b/src/polypcore/module.c
@@ -34,7 +34,7 @@
 
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "module.h"
 
diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c
index cf11f5a4..17d75146 100644
--- a/src/polypcore/namereg.c
+++ b/src/polypcore/namereg.c
@@ -35,7 +35,7 @@
 #include <polypcore/source.h>
 #include <polypcore/sink.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "namereg.h"
 
diff --git a/src/polypcore/parseaddr.c b/src/polypcore/parseaddr.c
index 7e518a5d..b2c7d1c7 100644
--- a/src/polypcore/parseaddr.c
+++ b/src/polypcore/parseaddr.c
@@ -29,7 +29,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "parseaddr.h"
 
diff --git a/src/polypcore/pdispatch.c b/src/polypcore/pdispatch.c
index 21e3644e..4b0d1bb2 100644
--- a/src/polypcore/pdispatch.c
+++ b/src/polypcore/pdispatch.c
@@ -32,7 +32,7 @@
 #include <polypcore/native-common.h>
 #include <polypcore/llist.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "pdispatch.h"
 
diff --git a/src/polypcore/pid.c b/src/polypcore/pid.c
index 53b8ad0a..e98dc97b 100644
--- a/src/polypcore/pid.c
+++ b/src/polypcore/pid.c
@@ -41,7 +41,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "pid.h"
diff --git a/src/polypcore/poll.c b/src/polypcore/poll.c
index 6a29a953..7b1ed438 100644
--- a/src/polypcore/poll.c
+++ b/src/polypcore/poll.c
@@ -42,7 +42,7 @@
 
 #ifndef HAVE_SYS_POLL_H
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "poll.h"
 
diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c
index 8f53694e..98738728 100644
--- a/src/polypcore/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -46,7 +46,7 @@
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "endianmacros.h"
 
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 338db002..f0e50ec5 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -45,7 +45,7 @@
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
 #include <polypcore/core-scache.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/autoload.h>
diff --git a/src/polypcore/random.c b/src/polypcore/random.c
index 1221206f..4bfce975 100644
--- a/src/polypcore/random.c
+++ b/src/polypcore/random.c
@@ -31,7 +31,7 @@
 #include <assert.h>
 #include <time.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "random.h"
diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c
index 6931d396..dc27ca2e 100644
--- a/src/polypcore/sink.c
+++ b/src/polypcore/sink.c
@@ -34,7 +34,7 @@
 
 #include <polypcore/sink-input.h>
 #include <polypcore/namereg.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
diff --git a/src/polypcore/socket-client.c b/src/polypcore/socket-client.c
index a61cf582..4fb0a5d8 100644
--- a/src/polypcore/socket-client.c
+++ b/src/polypcore/socket-client.c
@@ -57,7 +57,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/parseaddr.h>
 
diff --git a/src/polypcore/socket-server.c b/src/polypcore/socket-server.c
index 959173f2..96f8e073 100644
--- a/src/polypcore/socket-server.c
+++ b/src/polypcore/socket-server.c
@@ -65,7 +65,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "socket-server.h"
diff --git a/src/polypcore/socket-util.c b/src/polypcore/socket-util.c
index 0961db21..acbb7c1f 100644
--- a/src/polypcore/socket-util.c
+++ b/src/polypcore/socket-util.c
@@ -61,7 +61,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "socket-util.h"
diff --git a/src/polypcore/strlist.c b/src/polypcore/strlist.c
index 4d70e9e9..b9420749 100644
--- a/src/polypcore/strlist.c
+++ b/src/polypcore/strlist.c
@@ -29,7 +29,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/strbuf.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "strlist.h"