diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-14 02:23:43 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-14 02:23:43 +0000 |
commit | ea62077b850076c4d7dc3cf78ebd1888928c6ddf (patch) | |
tree | 37b7584ae40b99edb5583fbc4392b62ffdadf278 /archival | |
parent | 88ca06769028e442bf873b270c176ca0e9f021f8 (diff) | |
download | busybox-ea62077b850076c4d7dc3cf78ebd1888928c6ddf.tar.gz |
add open_read_close() and similar stuff
Diffstat (limited to 'archival')
-rw-r--r-- | archival/libunarchive/get_header_ar.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/open_transformer.c | 16 | ||||
-rw-r--r-- | archival/tar.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c index 7372ada32..b91c6f97d 100644 --- a/archival/libunarchive/get_header_ar.c +++ b/archival/libunarchive/get_header_ar.c @@ -79,7 +79,7 @@ char get_header_ar(archive_handle_t *archive_handle) (saved in variable long_name) that conatains the real filename */ const unsigned int long_offset = atoi(&ar.formatted.name[1]); if (long_offset >= ar_long_name_size) { - bb_error_msg_and_die("Cant resolve long filename"); + bb_error_msg_and_die("can't resolve long filename"); } typed->name = xstrdup(ar_long_names + long_offset); } diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c index 99e71ec2e..456d3e986 100644 --- a/archival/libunarchive/open_transformer.c +++ b/archival/libunarchive/open_transformer.c @@ -18,23 +18,23 @@ int open_transformer(int src_fd, int pid; if (pipe(fd_pipe) != 0) { - bb_perror_msg_and_die("Can't create pipe"); + bb_perror_msg_and_die("can't create pipe"); } pid = fork(); if (pid == -1) { - bb_perror_msg_and_die("Fork failed"); + bb_perror_msg_and_die("fork failed"); } if (pid == 0) { /* child process */ - close(fd_pipe[0]); /* We don't wan't to read from the parent */ - // FIXME: error check? - transformer(src_fd, fd_pipe[1]); - close(fd_pipe[1]); /* Send EOF */ + close(fd_pipe[0]); /* We don't wan't to read from the parent */ + // FIXME: error check? + transformer(src_fd, fd_pipe[1]); + close(fd_pipe[1]); /* Send EOF */ close(src_fd); - exit(0); - /* notreached */ + exit(0); + /* notreached */ } /* parent process */ diff --git a/archival/tar.c b/archival/tar.c index 5935ccaa3..2c4280cc4 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -457,7 +457,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, if (n == 0 && vfork_exec_errno != 0) { errno = vfork_exec_errno; - bb_perror_msg_and_die("Could not exec %s", zip_exec); + bb_perror_msg_and_die("cannot exec %s", zip_exec); } else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) continue; /* try it again */ break; |