generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-05-31 08:09:02 +02: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

63
Foundation/src/Path.cpp
View File

@ -50,7 +50,11 @@
#elif defined(POCO_OS_FAMILY_UNIX) #elif defined(POCO_OS_FAMILY_UNIX)
#include "Path_UNIX.cpp" #include "Path_UNIX.cpp"
#elif defined(POCO_OS_FAMILY_WINDOWS) && defined(POCO_WIN32_UTF8) #elif defined(POCO_OS_FAMILY_WINDOWS) && defined(POCO_WIN32_UTF8)
#if defined(_WIN32_WCE)
#include "Path_WINCE.cpp"
#else
#include "Path_WIN32U.cpp" #include "Path_WIN32U.cpp"
#endif
#elif defined(POCO_OS_FAMILY_WINDOWS) #elif defined(POCO_OS_FAMILY_WINDOWS)
#include "Path_WIN32.cpp" #include "Path_WIN32.cpp"
#endif #endif
@ -521,9 +525,18 @@ void Path::popDirectory()
} }
void Path::popFrontDirectory()
{
poco_assert (!_dirs.empty());
StringVec::iterator it = _dirs.begin();
_dirs.erase(it);
}
void Path::setFileName(const std::string& name) void Path::setFileName(const std::string& name)
{ {
_name = name; _name = name;
} }
@ -675,18 +688,20 @@ void Path::parseUnix(const std::string& path)
if (it != end) if (it != end)
{ {
if (_dirs.empty()) if (_dirs.empty())
{ {
if (!name.empty() && *(name.rbegin()) == ':') if (!name.empty() && *(name.rbegin()) == ':')
{ {
_device.assign(name, 0, name.length() - 1); _absolute = true;
_absolute = true; _device.assign(name, 0, name.length() - 1);
} }
else else
pushDirectory(name); {
} pushDirectory(name);
else pushDirectory(name); }
} }
else _name = name; else pushDirectory(name);
}
else _name = name;
if (it != end) ++it; if (it != end) ++it;
} }
} }
@ -711,17 +726,17 @@ void Path::parseWindows(const std::string& path)
} }
else if (it != end) else if (it != end)
{ {
char d = *it++; char d = *it++;
if (it != end && *it == ':') // drive letter if (it != end && *it == ':') // drive letter
{ {
if (_absolute || !(d >= 'a' && d <= 'z' || d >= 'A' && d <= 'Z')) throw PathSyntaxException(path); if (_absolute || !((d >= 'a' && d <= 'z') || (d >= 'A' && d <= 'Z'))) throw PathSyntaxException(path);
_absolute = true; _absolute = true;
_device += d; _device += d;
++it; ++it;
if (it == end || *it != '\\' && *it != '/') throw PathSyntaxException(path); if (it == end || (*it != '\\' && *it != '/')) throw PathSyntaxException(path);
++it; ++it;
} }
else --it; else --it;
} }
while (it != end) while (it != end)
{ {

45
Foundation/src/Path_UNIX.cpp
View File

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

38
Foundation/src/Path_WIN32.cpp
View File

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

36
Foundation/src/Path_WIN32U.cpp
View File

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