aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-09 20:32:33 +0100
committerKim Alvefur <zash@zash.se>2014-11-09 20:32:33 +0100
commit3b5fa59a5496cd0d19e2a0dac067188d61d76c36 (patch)
tree00a4652d294babdf3be6f9add9a811a0e180a5d8 /util
parent763567fa0236b0b80e0271ed1d3325501b979ee1 (diff)
parent486335f3dbc84dacf253120f544f1d2ee026cf94 (diff)
downloadprosody-3b5fa59a5496cd0d19e2a0dac067188d61d76c36.tar.gz
prosody-3b5fa59a5496cd0d19e2a0dac067188d61d76c36.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/paths.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/util/paths.lua b/util/paths.lua
index 3e5744df..89f4cad9 100644
--- a/util/paths.lua
+++ b/util/paths.lua
@@ -1,3 +1,5 @@
+local t_concat = table.concat;
+
local path_sep = package.config:sub(1,1);
local path_util = {}
@@ -35,4 +37,8 @@ function path_util.glob_to_pattern(glob)
end).."$";
end
+function path_util.join(...)
+ return t_concat({...}, path_sep);
+end
+
return path_util;