diff options
| author | Matt Wilson <msw@redhat.com> | 1999-11-30 22:23:45 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-11-30 22:23:45 +0000 |
| commit | beeb609dffdeb0414ca4658911e5dcb4dd8006a9 (patch) | |
| tree | ca5f92d6c694f54af9cf48f0161571e8d5fa86c3 /isys/cpio.c | |
| parent | f687e3cd850fb2378252c6d2fb0c3bbac2ef3107 (diff) | |
| download | anaconda-beeb609dffdeb0414ca4658911e5dcb4dd8006a9.tar.gz anaconda-beeb609dffdeb0414ca4658911e5dcb4dd8006a9.tar.xz anaconda-beeb609dffdeb0414ca4658911e5dcb4dd8006a9.zip | |
o changes needed to use rpmio from rpm HEADr0-7-3
o typo in exception screen
o other things that came along the way.
Diffstat (limited to 'isys/cpio.c')
| -rw-r--r-- | isys/cpio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/isys/cpio.c b/isys/cpio.c index 06e41502f..87631d8f6 100644 --- a/isys/cpio.c +++ b/isys/cpio.c @@ -10,8 +10,8 @@ int installCpioFile(FD_t fd, char * cpioName, char * outName, int inWin) { struct cpioFileMapping map; int rc; - char * failedFile; - CFD_t cfdbuf, *cfd = &cfdbuf; + const char * failedFile; + FD_t cfd; if (outName) { map.archivePath = cpioName; @@ -19,12 +19,12 @@ int installCpioFile(FD_t fd, char * cpioName, char * outName, int inWin) { map.mapFlags = CPIO_MAP_PATH; } - cfd->cpioIoType = cpioIoTypeGzFd; - cfd->cpioGzFd = gzdFdopen(fdDup(fdFileno(fd)), "r"); - + (void) Fflush(fd); + cfd = Fdopen(fdDup(Fileno(fd)), "r.gzdio"); + rc = cpioInstallArchive(cfd, outName ? &map : NULL, 1, NULL, NULL, &failedFile); - gzdClose(cfd->cpioGzFd); + Fclose(cfd); if (rc || access(outName, R_OK)) { return -1; |