summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-06-10 11:29:44 +0000
committerBernhard Reutner-Fischer2006-06-10 11:29:44 +0000
commit44e216f2642ff4ea53026792e80df95df71e9905 (patch)
tree5d292f6107e96579460f114d00cfdd799e4e3673
parent2d1a6e7c1fc5f5772aa9986893f3d6db28fd99c2 (diff)
downloadbusybox-44e216f2642ff4ea53026792e80df95df71e9905.zip
busybox-44e216f2642ff4ea53026792e80df95df71e9905.tar.gz
- use bb_xchdir instead of ignoring eventual errors of chdir
Thanks to Erik Hovland
-rw-r--r--archival/dpkg_deb.c4
-rw-r--r--archival/rpm.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index b99f227..48a1ac1 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -89,8 +89,8 @@ int dpkg_deb_main(int argc, char **argv)
extract_dir = argv[optind];
}
if (extract_dir) {
- mkdir(extract_dir, 0777);
- chdir(extract_dir); /* error check? */
+ mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */
+ bb_xchdir(extract_dir);
}
unpack_ar_archive(ar_archive);
diff --git a/archival/rpm.c b/archival/rpm.c
index 9bbc4a8..0755789 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -198,7 +198,7 @@ void extract_cpio_gz(int fd) {
bb_error_msg_and_die("Invalid gzip magic");
}
check_header_gzip(archive_handle->src_fd);
- chdir("/"); // Install RPM's to root
+ bb_xchdir("/"); // Install RPM's to root
archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip);
archive_handle->offset = 0;