feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Use system_error instead of strerror_r:

Browse Source 
* Addresses portability issues.
This commit is contained in:
Jaak Ristioja
2017-04-28 16:10:50 +03:00
committed by Howard Hinnant
parent cb83bc2501
commit ec7db09085
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tz.cpp
View File

@@ -2939,23 +2939,17 @@ current_zone()
CONSTDATA auto timezone = "/etc/localtime"; CONSTDATA auto timezone = "/etc/localtime";
if (lstat(timezone, &sb) == 0 && S_ISLNK(sb.st_mode) && sb.st_size > 0) if (lstat(timezone, &sb) == 0 && S_ISLNK(sb.st_mode) && sb.st_size > 0)
{ {
std::string result; using namespace std;
string result;
char rp[PATH_MAX]; char rp[PATH_MAX];
if (realpath(timezone, rp)) if (realpath(timezone, rp))
result = std::string(rp); result = string(rp);
else else
{ throw system_error(errno, system_category(), "realpath() failed");
std::ostringstream os;
char message[128];
if (strerror_r(errno, message, sizeof(message)) != 0)
message[0] = '\0';
os << "realpath failure: errno = " << errno << "; " << message;
throw std::runtime_error(os.str());
}
const char zonepath[] = "/usr/share/zoneinfo/"; const char zonepath[] = "/usr/share/zoneinfo/";
const std::size_t zonepath_len = sizeof(zonepath)/sizeof(zonepath[0])-1; const size_t zonepath_len = sizeof(zonepath)/sizeof(zonepath[0])-1;
const std::size_t pos = result.find(zonepath); const size_t pos = result.find(zonepath);
if (pos != result.npos) if (pos != result.npos)
result.erase(0, zonepath_len+pos); result.erase(0, zonepath_len+pos);
return locate_zone(result); return locate_zone(result);