src/server/util/util.c

changeset 114
c3a0f1275d71
parent 113
57e706fed20a
child 118
38bf6dd8f4e7
--- a/src/server/util/util.c	Tue Feb 09 22:53:59 2016 +0100
+++ b/src/server/util/util.c	Wed Feb 10 12:19:56 2016 +0100
@@ -475,18 +475,12 @@
     sstr_t parent = sstr(path);
     sstr_t child = sstr(ch);
     sstr_t newstr;
-    sstr_t s;
-    if(parent.ptr[parent.length-1] == '/') {
-        s.length = 0;
-    } else {
-        s = S("/");
-    }
     
     UcxAllocator a = util_pool_allocator(pool); 
-    if(s.length == 1) {
-        newstr = sstrcat_a(&a, 3, parent, s, child);
+    if(parent.ptr[parent.length-1] == '/') {
+        newstr = sstrcat_a(&a, 2, parent, child);
     } else {
-        newstr = sstrcat_a(&a, 2, parent, child);
+        newstr = sstrcat_a(&a, 3, parent, S("/"), child);
     }
     
     return newstr;

mercurial