Changeset 1009

Timestamp:

Feb 21, 2017, 1:50:18 AM (8 years ago)

Author:

dmik

Message:

rpm: Revert r634, r635, r639.

This is no longer necessary as fork crash was fixed in NSPR.
See #143 for more details.

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
@@ -53 +50 @@
     int p[2];
 
-#ifdef __KLIBC__
-
-    char cmdline[16*1024];
-    // place command line inside quotes to allow sh to execute all commands
-    // itself (otherwise also cmd is involved)
-    sprintf( cmdline, "sh -c \"%s\"", rpmcliPipeOutput);
-    // start child and redirect its input to us
-    pipeFD = popen( cmdline, "w");
-    if (pipeFD == NULL) {
-        fprintf(stderr, "creating a pipe for --pipe failed: %s\n", cmdline);
-        return -1;
-    }
-    // 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"));
@@ -88 +68 @@
     (void) dup2(p[1], STDOUT_FILENO);
     (void) close(p[1]);
-#endif
-
     return 0;
 }
@@ -96 +74 @@
 {
     int rc = 0;
-
-#ifdef __KLIBC__
-
-  if (pipeFD) {
-    // 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;
@@ -122 +86 @@
             rc = 1;
     }
-#endif
-
     return rc;
 }