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 /tools | |
| parent | 82c75cb6a261465700ca469793b54ad68bef99a8 (diff) | |
| download | rpm-0d0b405c201b43f2eebc61257f5992931e1cdb0c.tar.gz rpm-0d0b405c201b43f2eebc61257f5992931e1cdb0c.tar.bz2 rpm-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 'tools')
| -rw-r--r-- | tools/dump.c | 2 | ||||
| -rw-r--r-- | tools/rpmarchive.c | 4 | ||||
| -rw-r--r-- | tools/rpmgettext.c | 6 | ||||
| -rw-r--r-- | tools/rpminject.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/dump.c b/tools/dump.c index 24ad90277..4cc290b7e 100644 --- a/tools/dump.c +++ b/tools/dump.c @@ -24,7 +24,7 @@ int main(int argc, char ** argv) fprintf(stderr, _("headerRead error: %s\n"), strerror(errno)); exit(1); } - fdClose(fdi); + Fclose(fdi); headerDump(h, stdout, HEADER_DUMP_INLINE, rpmTagTable); headerFree(h); diff --git a/tools/rpmarchive.c b/tools/rpmarchive.c index 46813fccd..415969092 100644 --- a/tools/rpmarchive.c +++ b/tools/rpmarchive.c @@ -27,8 +27,8 @@ int main(int argc, char **argv) HEADER_MAGIC_YES : HEADER_MAGIC_NO); fdo = fdDup(STDOUT_FILENO); - while ((ct = fdRead(fdi, &buffer, 1024))) { - fdWrite(fdo, &buffer, ct); + while ((ct = Fread(buffer, sizeof(buffer), 1, fdi))) { + Fwrite(buffer, ct, 1, fdo); } return 0; diff --git a/tools/rpmgettext.c b/tools/rpmgettext.c index 4c8308abe..6cb552c83 100644 --- a/tools/rpmgettext.c +++ b/tools/rpmgettext.c @@ -761,7 +761,7 @@ rewriteBinaryRPM(char *fni, char *fno, message_list_ty *mlp) DPRINTF(99, ("rewriteBinaryRPM(\"%s\",\"%s\",%p)\n", fni, fno, mlp)); csa->cpioArchiveSize = 0; - csa->cpioFdIn = fdNew(); + csa->cpioFdIn = fdNew(&fdio); csa->cpioList = NULL; csa->cpioCount = 0; csa->lead = &lead; /* XXX FIXME: exorcize lead/arch/os */ @@ -784,7 +784,7 @@ rewriteBinaryRPM(char *fni, char *fno, message_list_ty *mlp) } exit: - fdClose(csa->cpioFdIn); + Fclose(csa->cpioFdIn); return rc; } @@ -847,7 +847,7 @@ rpmgettext(FD_t fd, const char *file, FILE *ofp) if (ofp != stdout) fclose(ofp); - fdClose(fd); + Fclose(fd); return 0; } diff --git a/tools/rpminject.c b/tools/rpminject.c index 2389a5b33..6f9aec914 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -444,7 +444,7 @@ rewriteRPM(const char *fni, const char *fno, cmd_t *cmds[], int ncmds) int rc; csa->cpioArchiveSize = 0; - csa->cpioFdIn = fdNew(); + csa->cpioFdIn = fdNew(&fdio); csa->cpioList = NULL; csa->cpioCount = 0; csa->lead = &lead; /* XXX FIXME: exorcize lead/arch/os */ @@ -467,7 +467,7 @@ rewriteRPM(const char *fni, const char *fno, cmd_t *cmds[], int ncmds) } exit: - fdClose(csa->cpioFdIn); + Fclose(csa->cpioFdIn); return rc; } |