diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-06-10 11:29:44 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-06-10 11:29:44 +0000 |
| commit | 44e216f2642ff4ea53026792e80df95df71e9905 (patch) | |
| tree | 5d292f6107e96579460f114d00cfdd799e4e3673 | |
| parent | 2d1a6e7c1fc5f5772aa9986893f3d6db28fd99c2 (diff) | |
| download | busybox-w32-44e216f2642ff4ea53026792e80df95df71e9905.tar.gz busybox-w32-44e216f2642ff4ea53026792e80df95df71e9905.tar.bz2 busybox-w32-44e216f2642ff4ea53026792e80df95df71e9905.zip | |
- use bb_xchdir instead of ignoring eventual errors of chdir
Thanks to Erik Hovland
| -rw-r--r-- | archival/dpkg_deb.c | 4 | ||||
| -rw-r--r-- | archival/rpm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index b99f227fc..48a1ac161 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c | |||
| @@ -89,8 +89,8 @@ int dpkg_deb_main(int argc, char **argv) | |||
| 89 | extract_dir = argv[optind]; | 89 | extract_dir = argv[optind]; |
| 90 | } | 90 | } |
| 91 | if (extract_dir) { | 91 | if (extract_dir) { |
| 92 | mkdir(extract_dir, 0777); | 92 | mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */ |
| 93 | chdir(extract_dir); /* error check? */ | 93 | bb_xchdir(extract_dir); |
| 94 | } | 94 | } |
| 95 | unpack_ar_archive(ar_archive); | 95 | unpack_ar_archive(ar_archive); |
| 96 | 96 | ||
diff --git a/archival/rpm.c b/archival/rpm.c index 9bbc4a856..075578971 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
| @@ -198,7 +198,7 @@ void extract_cpio_gz(int fd) { | |||
| 198 | bb_error_msg_and_die("Invalid gzip magic"); | 198 | bb_error_msg_and_die("Invalid gzip magic"); |
| 199 | } | 199 | } |
| 200 | check_header_gzip(archive_handle->src_fd); | 200 | check_header_gzip(archive_handle->src_fd); |
| 201 | chdir("/"); // Install RPM's to root | 201 | bb_xchdir("/"); // Install RPM's to root |
| 202 | 202 | ||
| 203 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip); | 203 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip); |
| 204 | archive_handle->offset = 0; | 204 | archive_handle->offset = 0; |