From 80f61a291bacff90dfb5775eb840a0a8fa95f3b2 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Thu, 22 Aug 2013 14:22:28 -0500 Subject: [PATCH 1/4] Use Q_UNUSED to supress compiler warning about return value --- src/core/qxtdaemon.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/qxtdaemon.cpp b/src/core/qxtdaemon.cpp index afe00187..1f882324 100644 --- a/src/core/qxtdaemon.cpp +++ b/src/core/qxtdaemon.cpp @@ -222,7 +222,8 @@ bool QxtDaemon::daemonize(bool pidfile) qFatal("can't get a lock on \"/var/run/%s.pid\". another instance is propably already running.", qPrintable(m_name)); QByteArray d = QByteArray::number(pid()); - Q_UNUSED(::write(lfp, d.constData(), d.size())); + ssize_t retval = ::write(lfp, d.constData(), d.size()); + Q_UNUSED(retval); } From b15990e2031244cfa92fa07377a2c5457677ed77 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Fri, 23 Aug 2013 14:47:59 -0500 Subject: [PATCH 2/4] Updates handling of ::write so that the return code is considered instead of ignored. --- src/core/qxtdaemon.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/qxtdaemon.cpp b/src/core/qxtdaemon.cpp index 1f882324..d7a94362 100644 --- a/src/core/qxtdaemon.cpp +++ b/src/core/qxtdaemon.cpp @@ -59,7 +59,7 @@ int main(int argc, char ** argv) #include #include #include - +#include #ifdef Q_OS_UNIX #include @@ -222,8 +222,14 @@ bool QxtDaemon::daemonize(bool pidfile) qFatal("can't get a lock on \"/var/run/%s.pid\". another instance is propably already running.", qPrintable(m_name)); QByteArray d = QByteArray::number(pid()); - ssize_t retval = ::write(lfp, d.constData(), d.size()); - Q_UNUSED(retval); + + int writtenSize = 0; + ssize_t retval = -1; + while( ((retval = ::write(lfp, d.constData() + writtenSize, d.size() - writtenSize)) != -1) && (writtenSize+=retval) && (writtenSize < d.size()) ); + if(retval == -1) + { + qFatal("Can't write to \"/var/run/%s.pid\". Exiting.", qPrintable(m_name)); + } } From 3dfa8a5186ca1600a0c0d55184ac8c39283678b9 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Fri, 23 Aug 2013 14:49:16 -0500 Subject: [PATCH 3/4] Removes supurfluous header include. --- src/core/qxtdaemon.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/qxtdaemon.cpp b/src/core/qxtdaemon.cpp index d7a94362..cf36f54b 100644 --- a/src/core/qxtdaemon.cpp +++ b/src/core/qxtdaemon.cpp @@ -59,7 +59,6 @@ int main(int argc, char ** argv) #include #include #include -#include #ifdef Q_OS_UNIX #include From fb6326731185a402b88ae172f759683688ca0ce0 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Fri, 23 Aug 2013 14:50:45 -0500 Subject: [PATCH 4/4] Adds back missing space >_>. --- src/core/qxtdaemon.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/qxtdaemon.cpp b/src/core/qxtdaemon.cpp index cf36f54b..7658dd72 100644 --- a/src/core/qxtdaemon.cpp +++ b/src/core/qxtdaemon.cpp @@ -60,6 +60,7 @@ int main(int argc, char ** argv) #include #include + #ifdef Q_OS_UNIX #include #include