Changeset 634

Timestamp:

Jan 5, 2016, 10:56:07 PM (10 years ago)

Author:

Yuri Dario

Message:

rpm: replace fork() with popen() when redirecting output. fixes ticket#143.

File:

• rpm/trunk/cliutils.c (modified) (5 diffs)

rpm/trunk/cliutils.c

@@ -15 +15 @@
 
 static pid_t pipeChild = 0;
+#ifdef __KLIBC__
+static FILE* pipeFD = NULL;
+#endif
 
 RPM_GNUC_NORETURN
@@ -50 +53 @@
     int p[2];
 
+#ifdef __KLIBC__
+
+    char cmdline[16*1024];
+    sprintf( cmdline, "sh -c %s", rpmcliPipeOutput);
+    // start child and redirect its input to us
+    pipeFD = popen( cmdline, "w");
+    // now redirect stdout to input handle
+    dup2( fileno(pipeFD), STDOUT_FILENO);
+
+#else
+
     if (pipe(p) < 0) {
         fprintf(stderr, _("creating a pipe for --pipe failed: %m\n"));
@@ -68 +82 @@
     (void) dup2(p[1], STDOUT_FILENO);
     (void) close(p[1]);
+#endif
+
     return 0;
 }
@@ -74 +90 @@
 {
     int rc = 0;
+
+#ifdef __KLIBC__
+
+    // close stdout to allow child to end
+    (void) fclose(stdout);
+    // wait child end and query exit code
+    int status = pclose(pipeFD);
+    pipeFD = NULL;
+    if (!WIFEXITED(status) || WEXITSTATUS(status))
+        rc = 1;
+
+#else
     if (pipeChild) {
         int status;
@@ -86 +114 @@
             rc = 1;
     }
+#endif
+
     return rc;
 }