use fullfile where appropriate

Author: scivision

+stdlib/absolute.m

@@ -33,7 +33,7 @@
 end
 
 if ~strempty(c)
-  c = strcat(b, '/', c);
+  c = fullfile(b, c);
 else
   c = b;
 end
@@ -46,4 +46,4 @@
 
 
 %!assert(absolute('', ''), pwd)
-%!assert(absolute('a/b', ''), strcat(pwd(), '/a/b'))
+%!assert(absolute('a/b', ''), fullfile(pwd(), 'a/b'))

+stdlib/expanduser.m

@@ -24,7 +24,7 @@
   elseif L < 2
     e = home;
   else
-    e = strcat(home, '/', e(3:end));
+    e = fullfile(home, e(3:end));
   end
 end
 
@@ -40,4 +40,4 @@
 %!assert(expanduser("~/"), strcat(homedir(), '/'))
 %!assert(expanduser("~user"), "~user")
 %!assert(expanduser("~user/"), "~user/")
-%!assert(expanduser("~/c"), strcat(homedir(), "/c"))
+%!assert(expanduser("~/c"), fullfile(homedir(), "c"))

+stdlib/get_shell.m

@@ -7,7 +7,7 @@
   cmd = "(dir 2>&1 *`|echo CMD);&<# rem #>echo ($PSVersionTable).PSEdition";
 else
 % https://askubuntu.com/a/1349538
-  cmd = strcat("lsof -p ", '"$$"', " | grep -m 1 txt | xargs -n 1 | tail -n +9");
+  cmd = strjoin({'lsof -p', '"$$"', '|','grep -m 1 txt', '|', 'xargs -n 1', '|', 'tail -n +9'});
 end
 
 [r, msg] = system(cmd);

+stdlib/homedir.m

@@ -8,8 +8,6 @@
   h = getenv("HOME");
 end
 
-h = stdlib.posix(h);
-
 end
 
 %!assert(!isempty(homedir()))

+stdlib/join.m

@@ -17,19 +17,15 @@
 elseif ~strempty(rdo)
 
   if ~strempty(rnb)
-    p = strcat(rnb, '/', other);
+    p = fullfile(rnb, other);
   else
     p = other;
   end
 
 elseif ~strempty(base)
 
   if ~strempty(other)
-    if endsWith(base, {'/', filesep})
-      p = strcat(base, other);
-    else
-      p = strcat(base, '/', other);
-    end
+    p = fullfile(base, other);
   else
     p = base;
   end

+stdlib/which.m

@@ -53,7 +53,7 @@
 
   if strempty(p), continue, end
 
-  e = strcat(p, '/', cmd);
+  e = fullfile(p, cmd);
   if isfile(e) && stdlib.is_exe(e)
     if find_all
       exe(end+1) = e; %#ok<AGROW>

+stdlib/with_suffix.m

@@ -27,7 +27,7 @@
 if strcmp(r, '.')
   f = s;
 else
-  f = strcat(r, filesep, s);
+  f = fullfile(r, s);
 end
 
 f = strcat(f, suffix);

test/TestAbsolute.m

@@ -26,7 +26,7 @@ function test_absolute1arg(tc, p1)
 r = tc.td;
 
 if strlength(p1)
-  r = strcat(r, '/', p1);
+  r = fullfile(r, p1);
 end
 
 if isstring(p1)
@@ -42,11 +42,11 @@ function test_absolute2arg(tc, p2)
 r = tc.td;
 
 if strlength(p2{2})
-  r = strcat(r, '/', p2{2});
+  r = fullfile(r, p2{2});
 end
 
 if strlength(p2{1})
-  r = strcat(r, '/', p2{1});
+  r = fullfile(r, p2{1});
 end
 
 if isstring(p2{1}) || isstring(p2{2})

test/TestExpanduser.m

@@ -6,10 +6,10 @@
 {"~abc", "~abc"}, ...
 {'~', stdlib.homedir()},...
 {"~", string(stdlib.homedir())}, ...
-{'~/', strcat(stdlib.homedir(), '/')},...
-{"~/", stdlib.homedir() + "/"}, ...
-{"~/c", stdlib.homedir() + "/c"}, ...
-{"~//c", stdlib.homedir() + "//c"}};
+{'~/', stdlib.homedir()},...
+{"~/", string(stdlib.homedir())}, ...
+{"~/c", fullfile(stdlib.homedir(), "c")}, ...
+{"~//c", fullfile(stdlib.homedir(), "c")}};
 end
 
 methods(Test, TestTags="impure")

test/TestJoin.m

@@ -4,16 +4,16 @@
 p = {{"", "", ""}, ...
 {"a", "", "a"}, ...
 {"", "a", "a"}, ...
-{"a/b/", "c", "a/b/c"}, ...
+{"a/b/", "c", fullfile("a", "b", "c")}, ...
 {"/", "", "/"}, ...
 {"", "/", "/"}, ...
-{"a", "b", "a/b"}, ...
-{"a/b/../", "c/d/..", "a/b/../c/d/.."}, ...
-{"a/b", "..", "a/b/.."}, ...
-{"a/b", "c/d", "a/b/c/d"}, ...
+{"a", "b", fullfile("a", "b")}, ...
+{"a/b/../", "c/d/..", fullfile("a", "b", "..", "c", "d", "..")}, ...
+{"a/b", "..", fullfile("a", "b", "..")}, ...
+{"a/b", "c/d", fullfile("a", "b", "c", "d")}, ...
 {"ab/cd", "/ef", "/ef"}, ...
 {stdlib.homedir(), "", stdlib.homedir()}, ...
-{matlabroot, "bin", matlabroot + "/bin"}
+{matlabroot, "bin", fullfile(matlabroot, "bin")}
 }
 end