walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Cleane up bit more of save_pid()

This commit is contained in:
Tatsuhiro Tsujikawa 2016-05-24 01:32:11 +09:00
parent e7d5cfff30
commit 98396f00ff
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shrpx.cc
View File

@ -203,17 +203,17 @@ void save_pid() {
constexpr auto SUFFIX = StringRef::from_lit(".XXXXXX"); constexpr auto SUFFIX = StringRef::from_lit(".XXXXXX");
auto &pid_file = get_config()->pid_file; auto &pid_file = get_config()->pid_file;
std::vector<char> temp_path; auto len = get_config()->pid_file.size() + SUFFIX.size();
temp_path.reserve(get_config()->pid_file.size() + SUFFIX.size() + 1); auto buf = make_unique<char[]>(len + 1);
auto p = buf.get();
std::copy(std::begin(pid_file), std::end(pid_file), p = std::copy(std::begin(pid_file), std::end(pid_file), p);
std::back_inserter(temp_path)); p = std::copy(std::begin(SUFFIX), std::end(SUFFIX), p);
auto p = std::copy(std::begin(SUFFIX), std::end(SUFFIX),
std::back_inserter(temp_path));
*p = '\0'; *p = '\0';
auto fd = mkstemp(temp_path.data()); auto temp_path = buf.get();
auto fd = mkstemp(temp_path);
if (fd == -1) { if (fd == -1) {
auto error = errno; auto error = errno;
LOG(ERROR) << "Could not save PID to file " << pid_file << ": " LOG(ERROR) << "Could not save PID to file " << pid_file << ": "
@ -239,12 +239,12 @@ void save_pid() {
close(fd); close(fd);
if (rename(temp_path.data(), pid_file.c_str()) == -1) { if (rename(temp_path, pid_file.c_str()) == -1) {
auto error = errno; auto error = errno;
LOG(ERROR) << "Could not save PID to file " << pid_file << ": " LOG(ERROR) << "Could not save PID to file " << pid_file << ": "
<< strerror(error); << strerror(error);
unlink(temp_path.data()); unlink(temp_path);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }