diff options
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) | |||
79 | (saved in variable long_name) that conatains the real filename */ | 79 | (saved in variable long_name) that conatains the real filename */ |
80 | const unsigned int long_offset = atoi(&ar.formatted.name[1]); | 80 | const unsigned int long_offset = atoi(&ar.formatted.name[1]); |
81 | if (long_offset >= ar_long_name_size) { | 81 | if (long_offset >= ar_long_name_size) { |
82 | bb_error_msg_and_die("Cant resolve long filename"); | 82 | bb_error_msg_and_die("can't resolve long filename"); |
83 | } | 83 | } |
84 | typed->name = xstrdup(ar_long_names + long_offset); | 84 | typed->name = xstrdup(ar_long_names + long_offset); |
85 | } | 85 | } |
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, | |||
18 | int pid; | 18 | int pid; |
19 | 19 | ||
20 | if (pipe(fd_pipe) != 0) { | 20 | if (pipe(fd_pipe) != 0) { |
21 | bb_perror_msg_and_die("Can't create pipe"); | 21 | bb_perror_msg_and_die("can't create pipe"); |
22 | } | 22 | } |
23 | 23 | ||
24 | pid = fork(); | 24 | pid = fork(); |
25 | if (pid == -1) { | 25 | if (pid == -1) { |
26 | bb_perror_msg_and_die("Fork failed"); | 26 | bb_perror_msg_and_die("fork failed"); |
27 | } | 27 | } |
28 | 28 | ||
29 | if (pid == 0) { | 29 | if (pid == 0) { |
30 | /* child process */ | 30 | /* child process */ |
31 | close(fd_pipe[0]); /* We don't wan't to read from the parent */ | 31 | close(fd_pipe[0]); /* We don't wan't to read from the parent */ |
32 | // FIXME: error check? | 32 | // FIXME: error check? |
33 | transformer(src_fd, fd_pipe[1]); | 33 | transformer(src_fd, fd_pipe[1]); |
34 | close(fd_pipe[1]); /* Send EOF */ | 34 | close(fd_pipe[1]); /* Send EOF */ |
35 | close(src_fd); | 35 | close(src_fd); |
36 | exit(0); | 36 | exit(0); |
37 | /* notreached */ | 37 | /* notreached */ |
38 | } | 38 | } |
39 | 39 | ||
40 | /* parent process */ | 40 | /* 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, | |||
457 | 457 | ||
458 | if (n == 0 && vfork_exec_errno != 0) { | 458 | if (n == 0 && vfork_exec_errno != 0) { |
459 | errno = vfork_exec_errno; | 459 | errno = vfork_exec_errno; |
460 | bb_perror_msg_and_die("Could not exec %s", zip_exec); | 460 | bb_perror_msg_and_die("cannot exec %s", zip_exec); |
461 | } else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) | 461 | } else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) |
462 | continue; /* try it again */ | 462 | continue; /* try it again */ |
463 | break; | 463 | break; |