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

resolve /etc/localtime by calling realpath

Browse Source
This commit is contained in:
Jiangang (Jeff) Zhuang
2017-01-13 21:00:17 -05:00
parent ea1717e8ab
commit 095f66af28
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tz.cpp
View File

@@ -3,7 +3,7 @@
// Copyright (c) 2015, 2016 Howard Hinnant // Copyright (c) 2015, 2016 Howard Hinnant
// Copyright (c) 2015 Ville Voutilainen // Copyright (c) 2015 Ville Voutilainen
// Copyright (c) 2016 Alexander Kormanovsky // Copyright (c) 2016 Alexander Kormanovsky
// Copyright (c) 2016 Jiangang Zhuang // Copyright (c) 2016, 2017 Jiangang Zhuang
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal // of this software and associated documentation files (the "Software"), to deal
@@ -110,6 +110,8 @@
#else // !WIN32 #else // !WIN32
# include <unistd.h> # include <unistd.h>
# include <wordexp.h> # include <wordexp.h>
# include <limits.h>
# include <string.h>
# if !USE_SHELL_API # if !USE_SHELL_API
# include <sys/stat.h> # include <sys/stat.h>
# include <sys/fcntl.h> # include <sys/fcntl.h>
@@ -3097,11 +3099,19 @@ 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(sb.st_size, '\0'); std::string result;
auto sz = readlink(timezone, &result.front(), result.size()); char rp[PATH_MAX];
if (sz == -1) if (realpath(timezone, rp))
throw std::runtime_error("readlink failure"); result = std::string(rp);
result.resize(sz); else
{
std::ostringstream os;
char message[128];
strerror_r(errno, message, 128);
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 std::size_t zonepath_len = sizeof(zonepath)/sizeof(zonepath[0])-1;
const std::size_t pos = result.find(zonepath); const std::size_t pos = result.find(zonepath);