parent: no posix

Author: scivision

+stdlib/parent.m

@@ -39,8 +39,6 @@
   end
 end
 
-p = stdlib.posix(p);
-
 if ~strlength(p)
   p = '.';
 end
@@ -66,7 +64,7 @@
 %!test
 %! if ispc
 %!   assert(parent('c:/a'), 'c:/')
-%!   assert(parent('c:\a\'), 'c:/')
+%!   assert(parent('c:\a\'), 'c:\')
 %!   assert(parent('c:\'), 'c:/')
 %!   assert(parent('c:'), 'c:/')
 %! end

src/octave/parent.cpp

@@ -15,7 +15,14 @@ DEFUN_DLD (parent, args, nargout,
     return octave_value("");
   }
 
-  std::string out = std::filesystem::path(fs_drop_slash(args(0).string_value())).parent_path().generic_string();
+  auto par = std::filesystem::path(fs_drop_slash(args(0).string_value())).parent_path();
 
-  return octave_value(out);
+  if (par.empty())
+    return ".";
+
+  // need this for <filesystem> or _splitpath_s to make x: x:/
+  if (fs_is_windows() && par == par.root_name())
+    par += '/';
+
+  return octave_value(par.string());
 }

src/parent_fs.cpp

@@ -7,23 +7,14 @@
 
 std::string fs_parent(std::string_view in)
 {
-  std::string out;
-  if(in.empty())
-    out = ".";
-  else
-    out = std::filesystem::path(fs_drop_slash(in)).parent_path().generic_string();
+  auto par = std::filesystem::path(fs_drop_slash(in)).parent_path();
 
-  // handle "/" and other no parent cases
-  if (out.empty()){
-    if (!in.empty() && in.front() == '/')
-      out = "/";
-    else
-      out = ".";
-  }
+  if (par.empty())
+    return ".";
 
-  // make x: x:/
-  if (fs_is_windows() && out.length() == 2 && !fs_root_name(out).empty())
-    out.push_back('/');
+  // need this for <filesystem> or _splitpath_s to make x: x:/
+  if (fs_is_windows() && par == par.root_name())
+    par += '/';
 
-  return out;
+  return par.string();
 }