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

Patch from Denis Vlasenko: unlzma was make files with mode 777. Tweak

Browse Source 
everything to do stat() and use xopen3().
This commit is contained in:
Rob Landley 2006-06-13 14:54:42 +00:00
parent 1dea55d577
commit 9a202c9daa
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archival/bunzip2.c
View File

@ -41,16 +41,21 @@ int bunzip2_main(int argc, char **argv)
/* Check that the input is sane. */
if (isatty(src_fd) && (opt & BUNZIP2_OPT_FORCE) == 0) {
bb_error_msg_and_die("compressed data not read from terminal. Use -f to force it.");
bb_error_msg_and_die("Compressed data not read from terminal. Use -f to force it.");
}
if (filename) {
struct stat stat_buf;
char *extension=filename+strlen(filename)-4;
if (strcmp(extension, ".bz2") != 0) {
bb_error_msg_and_die("Invalid extension");
}
/* TODO: xstat */
if (stat(filename, &stat_buf) < 0) {
bb_error_msg_and_die("Couldn't stat file %s", filename);
}
*extension=0;
dst_fd = bb_xopen(filename, O_WRONLY | O_CREAT);
dst_fd = bb_xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode);
} else dst_fd = STDOUT_FILENO;
status = uncompressStream(src_fd, dst_fd);
if(filename) {

7
archival/gunzip.c
View File

@ -137,11 +137,8 @@ int gunzip_main(int argc, char **argv)
bb_error_msg_and_die("Invalid extension");
}
/* Open output file */
dst_fd = bb_xopen(new_path, O_WRONLY | O_CREAT);
/* Set permissions on the file */
chmod(new_path, stat_buf.st_mode);
/* Open output file (with correct permissions) */
dst_fd = bb_xopen3(new_path, O_WRONLY | O_CREAT, stat_buf.st_mode);
/* If unzip succeeds remove the old file */
delete_path = old_path;

7
archival/unlzma.c
View File

@ -41,13 +41,18 @@ int unlzma_main(int argc, char **argv)
filename = 0;
if (filename) {
struct stat stat_buf;
char *extension = filename + strlen(filename) - 5;
if (strcmp(extension, ".lzma") != 0) {
bb_error_msg_and_die("Invalid extension");
}
/* TODO: xstat? */
if (stat(filename, &stat_buf) < 0) {
bb_error_msg_and_die("Couldn't stat file %s", filename);
}
*extension = 0;
dst_fd = bb_xopen(filename, O_WRONLY | O_CREAT);
dst_fd = bb_xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode);
} else
dst_fd = STDOUT_FILENO;
status = unlzma(src_fd, dst_fd);