(open_archive) clean API

(backported from trunk)

1 files changed, 3 insertions, 10 deletions

diff --git a/URPM.xs b/URPM.xs
index 370f7fc..9cf1389 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -1001,7 +1001,7 @@ update_provides_files(URPM__Package pkg, HV *provides) {
 }
 
 FD_t
-open_archive(char *filename, pid_t *pid, int *empty_archive) {
+open_archive(char *filename, int *empty_archive) {
   int fd;
   FD_t rfd = NULL;
   struct {
@@ -3400,11 +3400,10 @@ Urpm_parse_hdlist__XS(urpm, filename, ...)
     HV *obsoletes = fobsoletes && SvROK(*fobsoletes) && SvTYPE(SvRV(*fobsoletes)) == SVt_PVHV ? (HV*)SvRV(*fobsoletes) : NULL;
 
     if (depslist != NULL) {
-      pid_t pid = 0;
       int empty_archive = 0;
       FD_t fd;
 
-      fd = open_archive(filename, &pid, &empty_archive);
+      fd = open_archive(filename, &empty_archive);
 
       if (empty_archive) {
 	  XPUSHs(sv_2mortal(newSViv(1 + av_len(depslist))));
@@ -3458,13 +3457,7 @@ Urpm_parse_hdlist__XS(urpm, filename, ...)
 
 	int ok = Fclose(fd) == 0;
 
-	if (pid) {
-	  kill(pid, SIGTERM);
-	  int status;
-	  int rc = waitpid(pid, &status, 0);
-	  ok = rc != -1 && WEXITSTATUS(status) != 1; /* in our standard case, gzip will exit with status code 2, meaning "decompression OK, trailing garbage ignored" */
-	  pid = 0;
-	} else if (!empty_archive) {
+	if (!empty_archive) {
 	  ok = av_len(depslist) >= start_id;
 	}
 	SPAGAIN;