Mercurial > octave
view liboctave/system/dir-ops.cc @ 31216:f111d1caa73d stable
canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847).
* liboctave/system/file-ops.cc (canonicalize_file_name): Trim trailing file
separators from root of mapped network drive before potentially replacing it in
the canonicalized path.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Tue, 30 Aug 2022 18:26:30 +0200 |
parents | 796f54d4ddbf |
children | e88a07dec498 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1996-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <cerrno> #include <cstdlib> #include <cstring> #include <list> #include <string> #include "dirent-wrappers.h" #include "dir-ops.h" #include "file-ops.h" #include "lo-error.h" #include "lo-sysdep.h" #include "str-vec.h" namespace octave { namespace sys { bool dir_entry::open (const std::string& n) { if (! n.empty ()) m_name = n; if (! m_name.empty ()) { close (); std::string fullname = sys::file_ops::tilde_expand (m_name); m_dir = octave_opendir_wrapper (fullname.c_str ()); if (! m_dir) m_errmsg = std::strerror (errno); } else m_errmsg = "dir_entry::open: empty filename"; return m_dir != nullptr; } string_vector dir_entry::read (void) { string_vector retval; if (ok ()) { std::list<std::string> dirlist; char *fname; while ((fname = octave_readdir_wrapper (m_dir))) dirlist.push_back (fname); retval = string_vector (dirlist); } return retval; } bool dir_entry::close (void) { bool retval = true; if (m_dir) { retval = (octave_closedir_wrapper (m_dir) == 0); m_dir = nullptr; } return retval; } unsigned int dir_entry::max_name_length (void) { return octave_name_max_wrapper (); } } }