Browse Source

Merge pull request #856 from trapexit/dirname

dirname should not return an empty string
pull/857/head 2.32.2
trapexit 4 years ago
committed by GitHub
parent
commit
2e4c6c5fd1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/fs_acl.cpp
  2. 2
      src/fs_clonepath.cpp

2
src/fs_acl.cpp

@ -31,7 +31,7 @@ namespace fs
dir_has_defaults(const std::string &fullpath_) dir_has_defaults(const std::string &fullpath_)
{ {
int rv; int rv;
std::string dirpath;
std::string dirpath;
dirpath = fs::path::dirname(fullpath_); dirpath = fs::path::dirname(fullpath_);

2
src/fs_clonepath.cpp

@ -73,7 +73,7 @@ namespace fs
return 0; return 0;
dirname = fs::path::dirname(relative_); dirname = fs::path::dirname(relative_);
if(!dirname.empty())
if(dirname != "/")
{ {
rv = fs::clonepath(fromsrc_,tosrc_,dirname,return_metadata_errors_); rv = fs::clonepath(fromsrc_,tosrc_,dirname,return_metadata_errors_);
if(rv == -1) if(rv == -1)

Loading…
Cancel
Save