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.h | |
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.h')
-rw-r--r-- | isys/cpio.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/isys/cpio.h b/isys/cpio.h index 44301aee9..2ee92f1ce 100644 --- a/isys/cpio.h +++ b/isys/cpio.h @@ -3,7 +3,11 @@ #include <zlib.h> #define HAVE_ZLIB_H 1 -#include <rpm/rpmio.h> +#include <glob.h> /* XXX rpmlib.h */ +#include <dirent.h> /* XXX rpmlib.h */ + +#define HAVE_LIBIO 1 +#include <rpmlib.h> #define CPIO_MAP_PATH (1 << 0) #define CPIO_MAP_MODE (1 << 1) @@ -49,9 +53,9 @@ typedef struct CFD { typedef void (*cpioCallback)(struct cpioCallbackInfo * filespec, void * data); /* librpm provides these */ -int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings, - int numMappings, cpioCallback cb, void * cbData, - char ** failedFile); +int cpioInstallArchive(FD_t cfd, struct cpioFileMapping * mappings, + int numMappings, cpioCallback cb, void * cbData, + const char ** failedFile); const char *cpioStrerror(int rc); int installCpioFile(FD_t fd, char * cpioName, char * outName, int inWin); |