emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archival: added O_TRUNC so that when we overwrite files on unpack,

Browse Source 
we truncate them. Also spotted & fixed hard to trigger bug
          with extension handling.
This commit is contained in:
Denis Vlasenko
2006-09-03 14:23:29 +00:00
parent 314908da9e
commit 22dca23d52
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
archival/unlzma.c
View File

@@ -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);