Ticket #3910: 05-3910-mythshutdown-util-isRunning.2.patch

mythtv/programs/mythshutdown/main.cpp

@@ -17 +17 @@
 #include "tv.h"
 #include "remoteutil.h"
 #include "compat.h"
+#include "util.h"
 
 void setGlobalSetting(const QString &key, const QString &value)
 {
@@ -163 +164 @@
     return 0;
 }
 
-bool isRunning(QString program)
-{
-    QString sCommand = QString("ret=`ps cax | grep -c %1`; exit $ret")
-        .arg(program);
-    QByteArray aCommand = sCommand.toAscii();
-    int res = system(aCommand.constData());
-    if (WIFEXITED(res))
-        res = WEXITSTATUS(res);
-
-    return res;
-}
-
 QDateTime getDailyWakeupTime(QString sPeriod)
 {
     QString sTime = getGlobalSetting(sPeriod, "00:00");

mythtv/libs/libmyth/util.h

@@ -50 +50 @@
 MPUBLIC bool getUptime(time_t &uptime);
 MPUBLIC bool getMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM);
 
+MPUBLIC bool isRunning(QString program);
+
 MPUBLIC void myth_eject(void);
 
 MPUBLIC bool hasUtf8(const char *str);

mythtv/libs/libmyth/util.cpp

@@ -786 +786 @@
     return true;
 }
 
+/** \fn isRunning(QString program)
+ *  \brief Returns boolean true/false depending on whether program is running.
+ *
+ * Executes ps and grep to detect whether a program exists as a process.
+ */
+bool isRunning(QString program)
+{
+    QString sCommand = QString("ret=`ps cax | grep -c %1`; exit $ret")
+        .arg(program);
+    QByteArray aCommand = sCommand.toAscii();
+    int res = system(aCommand.constData());
+    if (WIFEXITED(res))
+        res = WEXITSTATUS(res);
+
+    return res;
+}
+
 /**
  * \brief Eject a disk, unmount a drive, open a tray
  *