diff options
| author | jbj <devnull@localhost> | 1999-10-27 23:18:10 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-10-27 23:18:10 +0000 |
| commit | 0d0b405c201b43f2eebc61257f5992931e1cdb0c (patch) | |
| tree | 7b19eee73f74dbd86e65255cff8be16b58292035 /lib/install.c | |
| parent | 82c75cb6a261465700ca469793b54ad68bef99a8 (diff) | |
| download | librpm-tizen-0d0b405c201b43f2eebc61257f5992931e1cdb0c.tar.gz librpm-tizen-0d0b405c201b43f2eebc61257f5992931e1cdb0c.tar.bz2 librpm-tizen-0d0b405c201b43f2eebc61257f5992931e1cdb0c.zip | |
use compressed filenames on install side.
start unifying FD types, CFD_t now gone.
CVS patchset: 3402
CVS date: 1999/10/27 23:18:10
Diffstat (limited to 'lib/install.c')
| -rw-r--r-- | lib/install.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/install.c b/lib/install.c index 592b41643..aacb1447f 100644 --- a/lib/install.c +++ b/lib/install.c @@ -301,6 +301,7 @@ static int installArchive(FD_t fd, struct fileInfo * files, int mappedFiles = 0; const char * failedFile = NULL; struct callbackInfo info; + FD_t cfd; if (!files) { /* install all files */ @@ -341,15 +342,11 @@ static int installArchive(FD_t fd, struct fileInfo * files, (void)notify(h, RPMCALLBACK_INST_PROGRESS, 0, archiveSize, pkgKey, notifyData); - { CFD_t cfdbuf, *cfd = &cfdbuf; - cfd->cpioPos = 0; - cfd->cpioIoType = cpioIoTypeGzFd; - cfd->cpioGzFd = gzdFdopen(fdDup(fdFileno(fd)), "r"); + cfd = gzdFdopen(fdDup(fdFileno(fd)), "r"); rc = cpioInstallArchive(cfd, map, mappedFiles, ((notify && archiveSize) || specFile) ? callback : NULL, &info, &failedFile); - gzdClose(cfd->cpioGzFd); - } + Fclose(cfd); headerFree(info.h); if (rc) { |