emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: more readable handling of pipe fds. No code changes.

Browse Source
This commit is contained in:
Denis Vlasenko
2008-02-16 13:20:56 +00:00
parent 1e18f1bab3
commit 3718832a15
12 changed files with 88 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
archival/libunarchive/open_transformer.c
View File

@@ -15,10 +15,10 @@ int open_transformer(int src_fd,
USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd),
const char *transform_prog)
{
int fd_pipe[2];
struct fd_pair fd_pipe;
int pid;
xpipe(fd_pipe);
xpiped_pair(fd_pipe);
#if BB_MMU
pid = fork();
@@ -30,12 +30,12 @@ int open_transformer(int src_fd,
if (pid == 0) {
/* child process */
close(fd_pipe[0]); /* We don't want to read from the parent */
close(fd_pipe.rd); /* We don't want to read from the parent */
// FIXME: error check?
#if BB_MMU
transformer(src_fd, fd_pipe[1]);
transformer(src_fd, fd_pipe.wr);
if (ENABLE_FEATURE_CLEAN_UP) {
close(fd_pipe[1]); /* Send EOF */
close(fd_pipe.wr); /* Send EOF */
close(src_fd);
}
exit(0);
@@ -43,7 +43,7 @@ int open_transformer(int src_fd,
{
char *argv[4];
xmove_fd(src_fd, 0);
xmove_fd(fd_pipe[1], 1);
xmove_fd(fd_pipe.wr, 1);
argv[0] = (char*)transform_prog;
argv[1] = (char*)"-cf";
argv[2] = (char*)"-";
@@ -56,7 +56,7 @@ int open_transformer(int src_fd,
}
/* parent process */
close(fd_pipe[1]); /* Don't want to write to the child */
close(fd_pipe.wr); /* Don't want to write to the child */
return fd_pipe[0];
return fd_pipe.rd;
}

2
archival/libunarchive/seek_by_jump.c
View File

@@ -6,7 +6,7 @@
#include "libbb.h"
#include "unarchive.h"
void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount)
void seek_by_jump(const archive_handle_t *archive_handle, unsigned amount)
{
if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {
#if ENABLE_FEATURE_UNARCHIVE_TAPE

4
archival/libunarchive/seek_by_read.c
View File

@@ -6,10 +6,10 @@
#include "libbb.h"
#include "unarchive.h"
/* If we are reading through a pipe(), or from stdin then we can't lseek,
/* If we are reading through a pipe, or from stdin then we can't lseek,
* we must read and discard the data to skip over it.
*/
void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size)
void seek_by_read(const archive_handle_t *archive_handle, unsigned jump_size)
{
if (jump_size)
bb_copyfd_exact_size(archive_handle->src_fd, -1, jump_size);