aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2001-07-13 06:49:18 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2001-07-13 06:49:18 +0000
commit26a0d9a9454ef2075079c74844297e61cd5e0293 (patch)
treee946772cc5b146fd23beb6efc6e9ad5acb246253
parentb028e08d353f18d23c6b81d4ef260b1954adae72 (diff)
downloadbusybox-w32-26a0d9a9454ef2075079c74844297e61cd5e0293.tar.gz
busybox-w32-26a0d9a9454ef2075079c74844297e61cd5e0293.tar.bz2
busybox-w32-26a0d9a9454ef2075079c74844297e61cd5e0293.zip
Call setvbuf from here isntead of gz_open for compatability with uclibc
-rw-r--r--archival/rpm2cpio.c3
-rw-r--r--rpm2cpio.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 8d4ca84dc..45c3ffb17 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -74,6 +74,8 @@ extern int rpm2cpio_main(int argc, char **argv)
74 } else { 74 } else {
75 rpmfile = fopen(argv[1], "r"); 75 rpmfile = fopen(argv[1], "r");
76 if (!rpmfile) perror_msg_and_die("Can't open rpm file"); 76 if (!rpmfile) perror_msg_and_die("Can't open rpm file");
77 /* set the buffer size */
78 setvbuf(rpmfile, NULL, _IOFBF, 0x8000);
77 } 79 }
78 80
79 fread (&lead, sizeof(struct rpm_lead), 1, rpmfile); 81 fread (&lead, sizeof(struct rpm_lead), 1, rpmfile);
@@ -85,6 +87,7 @@ extern int rpm2cpio_main(int argc, char **argv)
85 skip_header(rpmfile); 87 skip_header(rpmfile);
86 88
87 cpiofile = gz_open(rpmfile, &gunzip_pid); 89 cpiofile = gz_open(rpmfile, &gunzip_pid);
90
88 copyfd(fileno(cpiofile), fileno(stdout)); 91 copyfd(fileno(cpiofile), fileno(stdout));
89 gz_close(gunzip_pid); 92 gz_close(gunzip_pid);
90 fclose(rpmfile); 93 fclose(rpmfile);
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 8d4ca84dc..45c3ffb17 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -74,6 +74,8 @@ extern int rpm2cpio_main(int argc, char **argv)
74 } else { 74 } else {
75 rpmfile = fopen(argv[1], "r"); 75 rpmfile = fopen(argv[1], "r");
76 if (!rpmfile) perror_msg_and_die("Can't open rpm file"); 76 if (!rpmfile) perror_msg_and_die("Can't open rpm file");
77 /* set the buffer size */
78 setvbuf(rpmfile, NULL, _IOFBF, 0x8000);
77 } 79 }
78 80
79 fread (&lead, sizeof(struct rpm_lead), 1, rpmfile); 81 fread (&lead, sizeof(struct rpm_lead), 1, rpmfile);
@@ -85,6 +87,7 @@ extern int rpm2cpio_main(int argc, char **argv)
85 skip_header(rpmfile); 87 skip_header(rpmfile);
86 88
87 cpiofile = gz_open(rpmfile, &gunzip_pid); 89 cpiofile = gz_open(rpmfile, &gunzip_pid);
90
88 copyfd(fileno(cpiofile), fileno(stdout)); 91 copyfd(fileno(cpiofile), fileno(stdout));
89 gz_close(gunzip_pid); 92 gz_close(gunzip_pid);
90 fclose(rpmfile); 93 fclose(rpmfile);