summaryrefslogtreecommitdiff
path: root/archival/unlzma.c
diff options
context:
space:
mode:
authorDenis Vlasenko2006-09-03 14:23:29 +0000
committerDenis Vlasenko2006-09-03 14:23:29 +0000
commit22dca23d52c836e40c79cb4042b867fdc06f6ca3 (patch)
treea9f7e6c318e749875288358c963d53c25fab681a /archival/unlzma.c
parent314908da9e156e3100275598dde6848da038d65d (diff)
downloadbusybox-22dca23d52c836e40c79cb4042b867fdc06f6ca3.zip
busybox-22dca23d52c836e40c79cb4042b867fdc06f6ca3.tar.gz
archival: added O_TRUNC so that when we overwrite files on unpack,
we truncate them. Also spotted & fixed hard to trigger bug with extension handling.
Diffstat (limited to 'archival/unlzma.c')
-rw-r--r--archival/unlzma.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/archival/unlzma.c b/archival/unlzma.c
index fbd207c..00acea6 100644
--- a/archival/unlzma.c
+++ b/archival/unlzma.c
@@ -37,14 +37,15 @@ int unlzma_main(int argc, char **argv)
if (filename) {
struct stat stat_buf;
- char *extension = filename + strlen(filename) - 5;
-
- if (strcmp(extension, ".lzma") != 0) {
+ /* bug: char *extension = filename + strlen(filename) - 5; */
+ char *extension = strrchr(filename, '.');
+ if (!extension || strcmp(extension, ".lzma") != 0) {
bb_error_msg_and_die("Invalid extension");
}
xstat(filename, &stat_buf);
- *extension = 0;
- dst_fd = xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode);
+ *extension = '\0';
+ dst_fd = xopen3(filename, O_WRONLY | O_CREAT | O_TRUNC,
+ stat_buf.st_mode);
} else
dst_fd = STDOUT_FILENO;
status = unlzma(src_fd, dst_fd);