From 3c269b51a6f03a1a678e8d857522c6179dc8b31e Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 6 May 2011 16:41:03 -0400
Subject: [PATCH] util: Implement virRun as a wrapper around virCommand

v2:
    Simplify command building
    Handle command building failure

v3:
    Remove unneeded NULL check

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/util/util.c | 73 +++----------------------------------------------
 1 file changed, 4 insertions(+), 69 deletions(-)

diff --git a/src/util/util.c b/src/util/util.c
index b388ac2852..9b6bb78ef4 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -769,76 +769,11 @@ virExecWithHook(const char *const*argv,
 int
 virRun(const char *const*argv, int *status)
 {
-    pid_t childpid;
-    int exitstatus, execret, waitret;
-    int ret = -1;
-    int errfd = -1, outfd = -1;
-    char *outbuf = NULL;
-    char *errbuf = NULL;
-    char *argv_str = NULL;
-
-    if ((argv_str = virArgvToString(argv)) == NULL) {
-        virReportOOMError();
-        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;
+    int ret;
+    virCommandPtr cmd = virCommandNewArgs(argv);
 
-  error:
-    VIR_FREE(outbuf);
-    VIR_FREE(errbuf);
-    VIR_FORCE_CLOSE(outfd);
-    VIR_FORCE_CLOSE(errfd);
+    ret = virCommandRun(cmd, status);
+    virCommandFree(cmd);
     return ret;
 }
 
-- 
GitLab