mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

daemon_control: try to fix flagfile detection

Browse Source 
Origin commit data
------------------
Commit: da34a6294b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-10 (Sat, 10 Feb 2018)

Origin message was:
------------------
- daemon_control: try to fix flagfile detection
This commit is contained in:
vanhofen
2018-02-10 20:04:17 +01:00
parent 5744111b34
commit af7bddf797
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/daemon_control.cpp
View File

@@ -82,8 +82,6 @@ int CDaemonControlMenu::show()
{ {
int daemon_shortcut = 0; int daemon_shortcut = 0;
std::ostringstream buf;
CMenuWidget* daemonControlMenu = new CMenuWidget(LOCALE_DAEMON_CONTROL, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_PLUGINS_HIDE); CMenuWidget* daemonControlMenu = new CMenuWidget(LOCALE_DAEMON_CONTROL, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_PLUGINS_HIDE);
daemonControlMenu->addIntroItems(); daemonControlMenu->addIntroItems();
@@ -91,11 +89,11 @@ int CDaemonControlMenu::show()
CFlagFileNotifier * flagFileNotifier[DAEMONS_COUNT]; CFlagFileNotifier * flagFileNotifier[DAEMONS_COUNT];
for (unsigned int i = 0; i < DAEMONS_COUNT; i++) for (unsigned int i = 0; i < DAEMONS_COUNT; i++)
{ {
buf.str(""); std::string flagfile = FLAGDIR;
buf << FLAGDIR << "/." << daemons_data[i].flag; flagfile += "/.";
const char *flagfile = buf.str().c_str(); flagfile += daemons_data[i].flag;
daemons_data[i].flag_exist = file_exists(flagfile); daemons_data[i].flag_exist = file_exists(flagfile.c_str());
flagFileNotifier[i] = new CFlagFileNotifier(daemons_data[i].flag); flagFileNotifier[i] = new CFlagFileNotifier(daemons_data[i].flag);
@@ -159,7 +157,6 @@ int CCamdControlMenu::show()
{ {
int camd_shortcut = 0; int camd_shortcut = 0;
std::ostringstream buf;
char *buffer; char *buffer;
ssize_t read; ssize_t read;
size_t len; size_t len;
@@ -180,19 +177,20 @@ int CCamdControlMenu::show()
for (unsigned int i = 0; i < CAMDS_COUNT; i++) for (unsigned int i = 0; i < CAMDS_COUNT; i++)
{ {
std::string vinfo = ""; std::string vinfo = "";
std::string camd_binary = "/var/bin/";
camd_binary += camds_data[i].camd_file;
buf.str(""); camds_data[i].camd_exist = file_exists(camd_binary.c_str());
buf << "/var/bin/" << camds_data[i].camd_file;
camds_data[i].camd_exist = file_exists(buf.str().c_str());
if (camds_data[i].camd_exist) if (camds_data[i].camd_exist)
{ {
buf.str(""); std::string vinfo_call = "vinfo ";
buf << "vinfo " << camds_data[i].camd_name << " /var/bin/" << camds_data[i].camd_file; vinfo_call += camds_data[i].camd_name;
vinfo_call += " /var/bin/";
vinfo_call += camds_data[i].camd_file;
buffer = NULL; buffer = NULL;
if ((fh = popen(buf.str().c_str(), "r"))) if ((fh = popen(vinfo_call.c_str(), "r")))
{ {
while ((read = getline(&buffer, &len, fh)) != -1) while ((read = getline(&buffer, &len, fh)) != -1)
vinfo += buffer; vinfo += buffer;