recoll / Code / Diff of /src/utils/execmd.cpp

Diff of /src/utils/execmd.cpp [3c27d1] .. [e8671c]

Switch to unified view


...
    ExecCmdRsrc e(this);
    int status = -1;
    if (!m_killRequest && m_pid > 0) {
    if (waitpid(m_pid, &status, 0) < 0) 
        status = -1;
        LOGDEB(("ExecCmd::wait: got status 0x%x\n", status));
    m_pid = -1;
    }

    return haderror ? -1 : status;
}

// In child process. Set up pipes, environment, and exec command. 
// This must not return. exit() on error.

	a/src/utils/execmd.cpp		b/src/utils/execmd.cpp
	...		...
460	ExecCmdRsrc e(this);	460	ExecCmdRsrc e(this);
461	int status = -1;	461	int status = -1;
462	if (!m_killRequest && m_pid > 0) {	462	if (!m_killRequest && m_pid > 0) {
463	if (waitpid(m_pid, &status, 0) < 0)	463	if (waitpid(m_pid, &status, 0) < 0)
464	status = -1;	464	status = -1;
		465	LOGDEB(("ExecCmd::wait: got status 0x%x\n", status));
465	m_pid = -1;	466	m_pid = -1;
466	}	467	}
467	LOGDEB(("ExecCmd::wait: got status 0x%x\n", status));
468	return haderror ? -1 : status;	468	return haderror ? -1 : status;
469	}	469	}
470		470
471	// In child process. Set up pipes, environment, and exec command.	471	// In child process. Set up pipes, environment, and exec command.
472	// This must not return. exit() on error.	472	// This must not return. exit() on error.