summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-31 00:51:01 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-31 00:51:01 +0000
commit6eb2f88c5dc4c74634774aa242961b1630c0419c (patch)
treed871f18f294d2f4644a2dc947622cdd2f4b13801
parentc627871fdb379761a3c75e8d191cc5b63e63be63 (diff)
add two new functions pa_make_path_absolute()/pa_getcwd()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1737 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/core-util.c33
-rw-r--r--src/pulsecore/core-util.h3
2 files changed, 36 insertions, 0 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 2c5a32e9..82c0ea3c 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1208,3 +1208,36 @@ char *pa_truncate_utf8(char *c, size_t l) {
return c;
}
+
+char *pa_getcwd(void) {
+ size_t l = 128;
+
+ for (;;) {
+ char *p = pa_xnew(char, l);
+ if (getcwd(p, l))
+ return p;
+
+ if (errno != ERANGE)
+ return NULL;
+
+ pa_xfree(p);
+ l *= 2;
+ }
+}
+
+char *pa_make_path_absolute(const char *p) {
+ char *r;
+ char *cwd;
+
+ pa_assert(p);
+
+ if (p[0] == '/')
+ return pa_xstrdup(p);
+
+ if (!(cwd = pa_getcwd()))
+ return pa_xstrdup(p);
+
+ r = pa_sprintf_malloc("%s/%s", cwd, p);
+ pa_xfree(cwd);
+ return r;
+}
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index ea571e70..54749280 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -97,6 +97,9 @@ int pa_snprintf(char *str, size_t size, const char *format, ...);
char *pa_truncate_utf8(char *c, size_t l);
+char *pa_getcwd(void);
+char *pa_make_path_absolute(const char *p);
+
static inline int pa_is_power_of_two(unsigned n) {
return !(n & (n - 1));
}