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

strdup is not required here

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-18 22:48:45 +09:00
parent ce1b11e3a0
commit dbbc7296f5
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/shrpx.cc
View File

@ -230,7 +230,7 @@ void exec_binary(SignalServer *ssv) {
argv[0] = exec_path; argv[0] = exec_path;
for (int i = 1; i < get_config()->argc; ++i) { for (int i = 1; i < get_config()->argc; ++i) {
argv[i] = strdup(get_config()->argv[i]); argv[i] = get_config()->argv[i];
} }
argv[get_config()->argc] = nullptr; argv[get_config()->argc] = nullptr;
@ -241,30 +241,32 @@ void exec_binary(SignalServer *ssv) {
auto envp = make_unique<char *[]>(envlen + 3 + 1); auto envp = make_unique<char *[]>(envlen + 3 + 1);
size_t envidx = 0; size_t envidx = 0;
if (get_config()->host_unix) { std::string fd, fd6, path, port;
std::string fd = ENV_UNIX_FD "=";
fd += util::utos(ssv->server_fd);
envp[envidx++] = strdup(fd.c_str());
std::string path = ENV_UNIX_PATH "="; if (get_config()->host_unix) {
fd = ENV_UNIX_FD "=";
fd += util::utos(ssv->server_fd);
envp[envidx++] = &fd[0];
path = ENV_UNIX_PATH "=";
path += get_config()->host.get(); path += get_config()->host.get();
envp[envidx++] = strdup(path.c_str()); envp[envidx++] = &path[0];
} else { } else {
if (ssv->server_fd) { if (ssv->server_fd) {
std::string fd4 = ENV_LISTENER4_FD "="; fd = ENV_LISTENER4_FD "=";
fd4 += util::utos(ssv->server_fd); fd += util::utos(ssv->server_fd);
envp[envidx++] = strdup(fd4.c_str()); envp[envidx++] = &fd[0];
} }
if (ssv->server_fd6) { if (ssv->server_fd6) {
std::string fd6 = ENV_LISTENER6_FD "="; fd6 = ENV_LISTENER6_FD "=";
fd6 += util::utos(ssv->server_fd6); fd6 += util::utos(ssv->server_fd6);
envp[envidx++] = strdup(fd6.c_str()); envp[envidx++] = &fd6[0];
} }
std::string port = ENV_PORT "="; port = ENV_PORT "=";
port += util::utos(get_config()->port); port += util::utos(get_config()->port);
envp[envidx++] = strdup(port.c_str()); envp[envidx++] = &port[0];
} }
for (size_t i = 0; i < envlen; ++i) { for (size_t i = 0; i < envlen; ++i) {