External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Implement virRun as a wrapper around virCommand

Browse Source 
v2:
    Simplify command building
    Handle command building failure

v3:
    Remove unneeded NULL check

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2011-05-06 16:41:03 -04:00
parent d886ed9597
commit 3c269b51a6
1 changed files with 4 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/util/util.c
View File

@ -769,76 +769,11 @@ virExecWithHook(const char *const*argv,
int int
virRun(const char *const*argv, int *status) virRun(const char *const*argv, int *status)
{ {
pid_t childpid; int ret;
int exitstatus, execret, waitret; virCommandPtr cmd = virCommandNewArgs(argv);
int ret = -1;
int errfd = -1, outfd = -1;
char *outbuf = NULL;
char *errbuf = NULL;
char *argv_str = NULL;
if ((argv_str = virArgvToString(argv)) == NULL) { ret = virCommandRun(cmd, status);
virReportOOMError(); virCommandFree(cmd);
goto error;
}
VIR_DEBUG("%s", argv_str);
if ((execret = virExecWithHook(argv, NULL, NULL,
&childpid, -1, &outfd, &errfd,
VIR_EXEC_NONE, NULL, NULL, NULL)) < 0) {
ret = execret;
goto error;
}
if (virPipeReadUntilEOF(outfd, errfd, &outbuf, &errbuf) < 0) {
while (waitpid(childpid, &exitstatus, 0) == -1 && errno == EINTR)
;
goto error;
}
if (outbuf)
VIR_DEBUG("Command stdout: %s", outbuf);
if (errbuf)
VIR_DEBUG("Command stderr: %s", errbuf);
while ((waitret = waitpid(childpid, &exitstatus, 0) == -1) &&
errno == EINTR);
if (waitret == -1) {
virReportSystemError(errno,
_("cannot wait for '%s'"),
argv[0]);
goto error;
}
if (status == NULL) {
errno = EINVAL;
if (exitstatus) {
char *str = virCommandTranslateStatus(exitstatus);
char *argvstr = virArgvToString(argv);
if (!argv_str) {
virReportOOMError();
goto error;
}
virUtilError(VIR_ERR_INTERNAL_ERROR,
_("'%s' exited unexpectedly: %s"),
argv_str, NULLSTR(str));
VIR_FREE(str);
VIR_FREE(argvstr);
goto error;
}
} else {
*status = exitstatus;
}
ret = 0;
error:
VIR_FREE(outbuf);
VIR_FREE(errbuf);
VIR_FORCE_CLOSE(outfd);
VIR_FORCE_CLOSE(errfd);
return ret; return ret;
} }