generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-18 00:15:27 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: Path::popFrontDirectory()

Browse Source
This commit is contained in:
Marian Krivos 2011-08-23 06:57:44 +00:00
parent 6b42ce0d0a
commit df683a59eb
4 changed files with 139 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
Foundation/src/Path.cpp
View File

@ -16,14 +16,14 @@
// execute, and transmit the Software, and to prepare derivative works of the
// Software, and to permit third-parties to whom the Software is furnished to
// do so, all subject to the following:
//
//
// The copyright notices in the Software and this entire statement, including
// the above license grant, this restriction and the following disclaimer,
// must be included in all copies of the Software, in whole or in part, and
// all derivative works of the Software, unless such copies or derivative
// works are solely in the form of machine-executable object code generated by
// a source language processor.
//
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
@ -50,7 +50,11 @@
#elif defined(POCO_OS_FAMILY_UNIX)
#include "Path_UNIX.cpp"
#elif defined(POCO_OS_FAMILY_WINDOWS) && defined(POCO_WIN32_UTF8)
#if defined(_WIN32_WCE)
#include "Path_WINCE.cpp"
#else
#include "Path_WIN32U.cpp"
#endif
#elif defined(POCO_OS_FAMILY_WINDOWS)
#include "Path_WIN32.cpp"
#endif
@ -95,51 +99,51 @@ Path::Path(const char* path, Style style)
}
Path::Path(const Path& path):
_node(path._node),
Path::Path(const Path& path):
_node(path._node),
_device(path._device),
_name(path._name),
_version(path._version),
_dirs(path._dirs),
_absolute(path._absolute)
{
{
}
Path::Path(const Path& parent, const std::string& fileName):
_node(parent._node),
_node(parent._node),
_device(parent._device),
_name(parent._name),
_version(parent._version),
_dirs(parent._dirs),
_absolute(parent._absolute)
{
{
makeDirectory();
_name = fileName;
}
Path::Path(const Path& parent, const char* fileName):
_node(parent._node),
_node(parent._node),
_device(parent._device),
_name(parent._name),
_version(parent._version),
_dirs(parent._dirs),
_absolute(parent._absolute)
{
{
makeDirectory();
_name = fileName;
}
Path::Path(const Path& parent, const Path& relative):
_node(parent._node),
_node(parent._node),
_device(parent._device),
_name(parent._name),
_version(parent._version),
_dirs(parent._dirs),
_absolute(parent._absolute)
{
{
resolve(relative);
}
@ -148,13 +152,13 @@ Path::~Path()
{
}
Path& Path::operator = (const Path& path)
{
return assign(path);
}
Path& Path::operator = (const std::string& path)
{
return assign(path);
@ -206,7 +210,7 @@ Path& Path::assign(const std::string& path)
return *this;
}
Path& Path::assign(const std::string& path, Style style)
{
switch (style)
@ -250,7 +254,7 @@ std::string Path::toString() const
#endif
}
std::string Path::toString(Style style) const
{
switch (style)
@ -456,36 +460,36 @@ void Path::setNode(const std::string& node)
_absolute = _absolute || !node.empty();
}
void Path::setDevice(const std::string& device)
{
_device = device;
_absolute = _absolute || !device.empty();
}
const std::string& Path::directory(int n) const
{
poco_assert (0 <= n && n <= _dirs.size());
if (n < _dirs.size())
return _dirs[n];
else
return _name;
return _name;
}
const std::string& Path::operator [] (int n) const
{
poco_assert (0 <= n && n <= _dirs.size());
if (n < _dirs.size())
return _dirs[n];
else
return _name;
return _name;
}
void Path::pushDirectory(const std::string& dir)
{
if (!dir.empty() && dir != ".")
@ -512,18 +516,27 @@ void Path::pushDirectory(const std::string& dir)
}
}
void Path::popDirectory()
{
poco_assert (!_dirs.empty());
_dirs.pop_back();
}
void Path::popFrontDirectory()
{
poco_assert (!_dirs.empty());
StringVec::iterator it = _dirs.begin();
_dirs.erase(it);
}
void Path::setFileName(const std::string& name)
{
_name = name;
_name = name;
}
@ -559,7 +572,7 @@ void Path::setExtension(const std::string& extension)
}
}
std::string Path::getExtension() const
{
std::string::size_type pos = _name.rfind('.');
@ -586,13 +599,13 @@ std::string Path::current()
return PathImpl::currentImpl();
}
std::string Path::home()
{
return PathImpl::homeImpl();
}
std::string Path::temp()
{
return PathImpl::tempImpl();
@ -604,7 +617,7 @@ std::string Path::null()
return PathImpl::nullImpl();
}
std::string Path::expand(const std::string& path)
{
return PathImpl::expandImpl(path);
@ -652,7 +665,7 @@ void Path::parseUnix(const std::string& path)
if (it != end)
{
if (*it == '/')
if (*it == '/')
{
_absolute = true; ++it;
}
@ -675,18 +688,20 @@ void Path::parseUnix(const std::string& path)
if (it != end)
{
if (_dirs.empty())
{
if (!name.empty() && *(name.rbegin()) == ':')
{
_device.assign(name, 0, name.length() - 1);
_absolute = true;
}
else
pushDirectory(name);
}
else pushDirectory(name);
}
else _name = name;
{
if (!name.empty() && *(name.rbegin()) == ':')
{
_absolute = true;
_device.assign(name, 0, name.length() - 1);
}
else
{
pushDirectory(name);
}
}
else pushDirectory(name);
}
else _name = name;
if (it != end) ++it;
}
}
@ -711,17 +726,17 @@ void Path::parseWindows(const std::string& path)
}
else if (it != end)
{
char d = *it++;
if (it != end && *it == ':') // drive letter
{
if (_absolute || !(d >= 'a' && d <= 'z' || d >= 'A' && d <= 'Z')) throw PathSyntaxException(path);
_absolute = true;
_device += d;
++it;
if (it == end || *it != '\\' && *it != '/') throw PathSyntaxException(path);
++it;
}
else --it;
char d = *it++;
if (it != end && *it == ':') // drive letter
{
if (_absolute || !((d >= 'a' && d <= 'z') || (d >= 'A' && d <= 'Z'))) throw PathSyntaxException(path);
_absolute = true;
_device += d;
++it;
if (it == end || (*it != '\\' && *it != '/')) throw PathSyntaxException(path);
++it;
}
else --it;
}
while (it != end)
{
@ -780,7 +795,7 @@ void Path::parseVMS(const std::string& path)
}
}
}
}
}
if (name.empty())
{
if (it != end && *it == '[')
@ -806,7 +821,7 @@ void Path::parseVMS(const std::string& path)
{
if (_dirs.empty() || _dirs.back() == "..")
_dirs.push_back("..");
else
else
_dirs.pop_back();
}
else _dirs.push_back(name);
@ -877,7 +892,7 @@ void Path::parseGuess(const std::string& path)
case '\\': hasBackslash = true; break;
case '/': hasSlash = true; break;
case '[': hasOpenBracket = true;
case ']': hasClosBracket = hasOpenBracket;
case ']': hasClosBracket = hasOpenBracket;
case ';': semiIt = it; break;
}
}

45
Foundation/src/Path_UNIX.cpp
View File

@ -1,7 +1,7 @@
//
// Path_UNIX.cpp
//
// $Id: //poco/svn/Foundation/src/Path_UNIX.cpp#2 $
// $Id: //poco/1.4/Foundation/src/Path_UNIX.cpp#3 $
//
// Library: Foundation
// Package: Filesystem
@ -37,11 +37,13 @@
#include "Poco/Path_UNIX.h"
#include "Poco/Exception.h"
#include "Poco/Environment_UNIX.h"
#include "Poco/Ascii.h"
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#if !defined(POCO_VXWORKS)
#include <pwd.h>
#include <cctype>
#endif
#include <climits>
@ -69,9 +71,15 @@ std::string PathImpl::currentImpl()
std::string PathImpl::homeImpl()
{
std::string path;
struct passwd* pwd = getpwuid(getuid());
if (pwd)
#if defined(POCO_VXWORKS)
if (EnvironmentImpl::hasImpl("HOME"))
return EnvironmentImpl::getImpl("HOME");
else
return "/";
#else
std::string path;
struct passwd* pwd = getpwuid(getuid());
if (pwd)
path = pwd->pw_dir;
else
{
@ -81,9 +89,10 @@ std::string PathImpl::homeImpl()
else
path = EnvironmentImpl::getImpl("HOME");
}
std::string::size_type n = path.size();
if (n > 0 && path[n - 1] != '/') path.append("/");
return path;
std::string::size_type n = path.size();
if (n > 0 && path[n - 1] != '/') path.append("/");
return path;
#endif
}
@ -107,7 +116,11 @@ std::string PathImpl::tempImpl()
std::string PathImpl::nullImpl()
{
return "/dev/null";
#if defined(POCO_VXWORKS)
return "/null";
#else
return "/dev/null";
#endif
}
@ -136,13 +149,13 @@ std::string PathImpl::expandImpl(const std::string& path)
++it;
while (it != end && *it != '}') var += *it++;
if (it != end) ++it;
}
else
{
while (it != end && (std::isalnum(*it) || *it == '_')) var += *it++;
}
char* val = getenv(var.c_str());
if (val) result += val;
}
else
{
while (it != end && (Ascii::isAlphaNumeric(*it) || *it == '_')) var += *it++;
}
char* val = getenv(var.c_str());
if (val) result += val;
}
else result += *it++;
}

38
Foundation/src/Path_WIN32.cpp
View File

@ -44,10 +44,10 @@ namespace Poco {
std::string PathImpl::currentImpl()
{
char buffer[_MAX_PATH];
DWORD n = GetCurrentDirectoryA(sizeof(buffer), buffer);
if (n > 0 && n < sizeof(buffer))
{
char buffer[MAX_PATH];
DWORD n = GetCurrentDirectoryA(sizeof(buffer), buffer);
if (n > 0 && n < sizeof(buffer))
{
std::string result(buffer, n);
if (result[n - 1] != '\\')
result.append("\\");
@ -70,16 +70,18 @@ std::string PathImpl::homeImpl()
std::string PathImpl::tempImpl()
{
char buffer[_MAX_PATH];
DWORD n = GetTempPathA(sizeof(buffer), buffer);
if (n > 0 && n < sizeof(buffer))
{
std::string result(buffer, n);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
else throw SystemException("Cannot get current directory");
char buffer[MAX_PATH];
DWORD n = GetTempPathA(sizeof(buffer), buffer);
if (n > 0 && n < sizeof(buffer))
{
n = GetLongPathNameA(buffer.begin(), buffer.begin(), static_cast<DWORD>(buffer.size()));
if (n <= 0) throw SystemException("Cannot get temporary directory long path name");
std::string result(buffer, n);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
else throw SystemException("Cannot get temporary directory");
}
@ -91,10 +93,10 @@ std::string PathImpl::nullImpl()
std::string PathImpl::expandImpl(const std::string& path)
{
char buffer[_MAX_PATH];
DWORD n = ExpandEnvironmentStringsA(path.c_str(), buffer, sizeof(buffer));
if (n > 0 && n < sizeof(buffer))
return std::string(buffer, n - 1);
char buffer[MAX_PATH];
DWORD n = ExpandEnvironmentStringsA(path.c_str(), buffer, sizeof(buffer));
if (n > 0 && n < sizeof(buffer))
return std::string(buffer, n - 1);
else
return path;
}

36
Foundation/src/Path_WIN32U.cpp
View File

@ -53,13 +53,13 @@ std::string PathImpl::currentImpl()
{
Buffer<wchar_t> buffer(len);
DWORD n = GetCurrentDirectoryW(len, buffer.begin());
if (n > 0 && n <= len)
{
UnicodeConverter::toUTF8(buffer.begin(), result);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
if (n > 0 && n <= len)
{
UnicodeConverter::toUTF8(buffer.begin(), result);
if (result[result.size() - 1] != '\\')
result.append("\\");
return result;
}
}
throw SystemException("Cannot get current directory");
}
@ -79,16 +79,18 @@ std::string PathImpl::homeImpl()
std::string PathImpl::tempImpl()
{
Buffer<wchar_t> buffer(MAX_PATH_LEN);
DWORD n = GetTempPathW(static_cast<DWORD>(buffer.size()), buffer.begin());
if (n > 0)
{
std::string result;
UnicodeConverter::toUTF8(buffer.begin(), result);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
throw SystemException("Cannot get current directory");
DWORD n = GetTempPathW(static_cast<DWORD>(buffer.size()), buffer.begin());
if (n > 0)
{
n = GetLongPathNameW(buffer.begin(), buffer.begin(), static_cast<DWORD>(buffer.size()));
if (n <= 0) throw SystemException("Cannot get temporary directory long path name");
std::string result;
UnicodeConverter::toUTF8(buffer.begin(), result);
if (result[result.size() - 1] != '\\')
result.append("\\");
return result;
}
throw SystemException("Cannot get temporary directory path");
}