diff options
| author | Glenn L McGrath | 2001-07-13 06:43:03 +0000 |
|---|---|---|
| committer | Glenn L McGrath | 2001-07-13 06:43:03 +0000 |
| commit | b028e08d353f18d23c6b81d4ef260b1954adae72 (patch) | |
| tree | c00537b1d8474c837312818bc48f6b822e8fb4d1 | |
| parent | 7467c8d3b6a50e2cbd8db750963d40b420ad38d1 (diff) | |
| download | busybox-b028e08d353f18d23c6b81d4ef260b1954adae72.zip busybox-b028e08d353f18d23c6b81d4ef260b1954adae72.tar.gz | |
Move setvbuf calls from gz_open() to calling functions, setvbuf is only supposed to be called prior to opening the stream, glibc tolerates later use, uclibc doesnt.
| -rw-r--r-- | archival/gunzip.c | 3 | ||||
| -rw-r--r-- | archival/tar.c | 4 | ||||
| -rw-r--r-- | gunzip.c | 3 | ||||
| -rw-r--r-- | libbb/unarchive.c | 3 | ||||
| -rw-r--r-- | tar.c | 4 |
5 files changed, 17 insertions, 0 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c index c4e8426..430bc63 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -118,6 +118,9 @@ extern int gunzip_main(int argc, char **argv) /* Open input file */ in_file = xfopen(if_name, "r"); + /* set the buffer size */ + setvbuf(in_file, NULL, _IOFBF, 0x8000); + /* Get the time stamp on the input file. */ if (stat(if_name, &stat_buf) < 0) { error_msg_and_die("Couldn't stat file %s", if_name); diff --git a/archival/tar.c b/archival/tar.c index 31443ee..cf65798 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -284,6 +284,10 @@ extern int tar_main(int argc, char **argv) /* unzip tarFd in a seperate process */ if (unzipFlag == TRUE) { comp_file = fdopen(tarFd, "r"); + + /* set the buffer size */ + setvbuf(comp_file, NULL, _IOFBF, 0x8000); + if ((tarFd = fileno(gz_open(comp_file, &pid))) == EXIT_FAILURE) { error_msg_and_die("Couldnt unzip file"); } @@ -118,6 +118,9 @@ extern int gunzip_main(int argc, char **argv) /* Open input file */ in_file = xfopen(if_name, "r"); + /* set the buffer size */ + setvbuf(in_file, NULL, _IOFBF, 0x8000); + /* Get the time stamp on the input file. */ if (stat(if_name, &stat_buf) < 0) { error_msg_and_die("Couldn't stat file %s", if_name); diff --git a/libbb/unarchive.c b/libbb/unarchive.c index 5c5bb49..80dddb2 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -568,6 +568,9 @@ char *deb_extract(const char *package_filename, FILE *out_stream, /* open the debian package to be worked on */ deb_stream = wfopen(package_filename, "r"); + /* set the buffer size */ + setvbuf(deb_stream, NULL, _IOFBF, 0x8000); + /* check ar magic */ fread(ar_magic, 1, 8, deb_stream); if (strncmp(ar_magic,"!<arch>",7) != 0) { @@ -284,6 +284,10 @@ extern int tar_main(int argc, char **argv) /* unzip tarFd in a seperate process */ if (unzipFlag == TRUE) { comp_file = fdopen(tarFd, "r"); + + /* set the buffer size */ + setvbuf(comp_file, NULL, _IOFBF, 0x8000); + if ((tarFd = fileno(gz_open(comp_file, &pid))) == EXIT_FAILURE) { error_msg_and_die("Couldnt unzip file"); } |