tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid bogus error message in margin case

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-10-28 16:47:23 +01:00
parent b8963db4b1
commit e0e66a306d
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/utils/execmd.cpp
View File

@ -36,6 +36,7 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
using namespace std;
#include "execmd.h" #include "execmd.h"
#include "pathut.h" #include "pathut.h"
@ -45,20 +46,9 @@
#include "closefrom.h" #include "closefrom.h"
#include "ptmutex.h" #include "ptmutex.h"
#ifndef NO_NAMESPACES
using namespace std;
#endif /* NO_NAMESPACES */
#ifndef MAX
#define MAX(A,B) ((A) > (B) ? (A) : (B))
#endif
#ifndef MIN
#define MIN(A,B) ((A) < (B) ? (A) : (B))
#endif
/* From FreeBSD's which command */ /* From FreeBSD's which command */
static bool static bool exec_is_there(const char *candidate)
exec_is_there(const char *candidate)
{ {
struct stat fin; struct stat fin;
@ -135,13 +125,18 @@ public:
close(m_parent->m_pipeout[0]); close(m_parent->m_pipeout[0]);
if (m_parent->m_pipeout[1] >= 0) if (m_parent->m_pipeout[1] >= 0)
close(m_parent->m_pipeout[1]); close(m_parent->m_pipeout[1]);
int status;
if (m_parent->m_pid > 0) { // It's apparently possible for m_pid to be > 0 and getpgid to fail. In
pid_t grp = getpgid(m_parent->m_pid); // this case, we have to conclude that the child process does
// not exist. Not too sure what causes this, but the previous code
// definitely tried to call killpg(-1,) from time to time.
pid_t grp;
if (m_parent->m_pid > 0 && (grp = getpgid(m_parent->m_pid)) > 0) {
LOGDEB(("ExecCmd: killpg(%d, SIGTERM)\n", grp)); LOGDEB(("ExecCmd: killpg(%d, SIGTERM)\n", grp));
int ret = killpg(grp, SIGTERM); int ret = killpg(grp, SIGTERM);
if (ret == 0) { if (ret == 0) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
int status;
(void)waitpid(m_parent->m_pid, &status, WNOHANG); (void)waitpid(m_parent->m_pid, &status, WNOHANG);
if (kill(m_parent->m_pid, 0) != 0) if (kill(m_parent->m_pid, 0) != 0)
break; break;