ervin/comfortable-swipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::unique_ptr for stop service

Browse Source
This commit is contained in:
Rico Tiongson 2019-02-13 08:52:28 +08:00
parent c18cb04230
commit 40dec4900e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/service/stop.cpp
View File

@ -24,6 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdexcept> // std::runtime_error #include <stdexcept> // std::runtime_error
#include <unistd.h> // popen, pclose, getpid #include <unistd.h> // popen, pclose, getpid
#include <memory> // std::unique_ptr
#include <array> // std::array
#include <cstdio> // FILE
namespace comfortable_swipe::service namespace comfortable_swipe::service
{ {
@ -34,24 +37,22 @@ namespace comfortable_swipe::service
{ {
// read all service names from process (pgrep) // read all service names from process (pgrep)
char* buffer = new char[20]; std::array<char, 128> buffer;
FILE* pipe = popen("pgrep -f comfortable-swipe", "r"); std::unique_ptr<FILE, decltype(&pclose)> pipe(popen("pgrep -f comfortable-swipe", "r"), pclose);
// make sure pipe exists // make sure pipe exists
if (pipe == NULL) if (!pipe)
{
throw std::runtime_error("stop command failed"); throw std::runtime_error("stop command failed");
}
// buffer what to kill // buffer what to kill
std::string kill = "kill"; std::string kill = "kill";
// read until end of line // read until end of line
while (!std::feof(pipe)) while (!std::feof(pipe.get()))
{ {
if (std::fgets(buffer, 20, pipe) != NULL) if (std::fgets(buffer.data(), buffer.size(), pipe.get()) != NULL)
{ {
int pid = std::atoi(buffer); int pid = std::atoi(buffer.data());
if (pid != getpid()) if (pid != getpid())
{ {
kill += " "; kill += " ";
@ -62,11 +63,6 @@ namespace comfortable_swipe::service
// run "kill {pid1} {pid2}..." // run "kill {pid1} {pid2}..."
(void) std::system(kill.data()); (void) std::system(kill.data());
delete[] buffer;
// close the pipe
pclose(pipe);
} }
} }