dc03f003ac
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABAgAGBQJUa62OAAoJECNuiljG20US1CkP/3YaAg76hJDaeFAyi7/10lOs yI8tPmpQk8S+nuclsBJeIr+9xNRsjb1ebW4tI9uBRxqMT10SF7rMCH/qAmgnS9tQ 6M48hF0o9xegjz4x5BosEJjXtiekYN068Xi/hk+H27guVy14f6Xx7oRpdr5oI/O0 F83D1V2+vs6FuOyn42UQQNHVlYMac5SScHoSFomnwRYWI2wb2ay4H5Dlykb5BUl0 tTjJ2lYwN18vUoMxjmCNS+bLd7jag6FZ/PXntB1zXe22R17eAIuFZAMKaQvnQtUi QZjFPhpd+mBsZLfokB3belyNNb4F6qSG2W6lZrFRB+SU/LqnY2AL/dxPJD9eiufs 5jEIOw9hNBBKo217+hkPwp5pAF50u11tKXUXbKGeR42zAO0zll/+g2afVwoqdAfD llPDyQyXiB3tmA1bgJD7u9gaud3UaaXoxajPb5LnmklzGxiN5u1rnoo+E5ppBvQ4 31wPHGpzsjxEC7Xn9hErPP17jYXY1HT/xRb8XZNrFqJVZxSyjqQlDWomhCWDcvPc Du1PyKaQ08zgElEM5trwC9RjJxQdr0sckQcTnYC/0ksfJ7Nhh8M2yepEI/gmWbnO JBQ7YzpQhE9oMMH8jzVLLdC44yF6QvXcGQ3D9eUfwvPk9Z70mHlNI3Q6kbZ76U5j RHLp+oSaxFUXfPdciZaw =GO+k -----END PGP SIGNATURE----- Merge tag 'v0.18.18' into v0.19.x
121 lines
2.5 KiB
C++
121 lines
2.5 KiB
C++
/*
|
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program 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 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "AllocatedPath.hxx"
|
|
#include "Domain.hxx"
|
|
#include "Charset.hxx"
|
|
#include "util/Error.hxx"
|
|
#include "Compiler.h"
|
|
|
|
#ifdef HAVE_GLIB
|
|
#include <glib.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef HAVE_GLIB
|
|
|
|
inline AllocatedPath::AllocatedPath(Donate, pointer _value)
|
|
:value(_value) {
|
|
g_free(_value);
|
|
}
|
|
|
|
#endif
|
|
|
|
/* no inlining, please */
|
|
AllocatedPath::~AllocatedPath() {}
|
|
|
|
AllocatedPath
|
|
AllocatedPath::FromUTF8(const char *path_utf8)
|
|
{
|
|
#ifdef HAVE_GLIB
|
|
char *path = ::PathFromUTF8(path_utf8);
|
|
if (path == nullptr)
|
|
return AllocatedPath::Null();
|
|
|
|
return AllocatedPath(Donate(), path);
|
|
#else
|
|
return FromFS(path_utf8);
|
|
#endif
|
|
}
|
|
|
|
AllocatedPath
|
|
AllocatedPath::FromUTF8(const char *path_utf8, Error &error)
|
|
{
|
|
AllocatedPath path = FromUTF8(path_utf8);
|
|
if (path.IsNull())
|
|
error.Format(path_domain,
|
|
"Failed to convert to file system charset: %s",
|
|
path_utf8);
|
|
|
|
return path;
|
|
}
|
|
|
|
AllocatedPath
|
|
AllocatedPath::GetDirectoryName() const
|
|
{
|
|
return FromFS(PathTraitsFS::GetParent(c_str()));
|
|
}
|
|
|
|
std::string
|
|
AllocatedPath::ToUTF8() const
|
|
{
|
|
return ::PathToUTF8(c_str());
|
|
}
|
|
|
|
const char *
|
|
AllocatedPath::RelativeFS(const char *other_fs) const
|
|
{
|
|
const size_t l = length();
|
|
if (memcmp(data(), other_fs, l) != 0)
|
|
return nullptr;
|
|
|
|
other_fs += l;
|
|
if (*other_fs != 0) {
|
|
if (!PathTraitsFS::IsSeparator(*other_fs))
|
|
/* mismatch */
|
|
return nullptr;
|
|
|
|
/* skip remaining path separators */
|
|
do {
|
|
++other_fs;
|
|
} while (PathTraitsFS::IsSeparator(*other_fs));
|
|
}
|
|
|
|
return other_fs;
|
|
}
|
|
|
|
void
|
|
AllocatedPath::ChopSeparators()
|
|
{
|
|
size_t l = length();
|
|
const char *p = data();
|
|
|
|
while (l >= 2 && PathTraitsFS::IsSeparator(p[l - 1])) {
|
|
--l;
|
|
|
|
#if GCC_CHECK_VERSION(4,7) && !defined(__clang__)
|
|
value.pop_back();
|
|
#else
|
|
value.erase(value.end() - 1, value.end());
|
|
#endif
|
|
}
|
|
}
|