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

usage.h: remove ugly tricks. We have USE_FEATURE_xxx now.

Browse Source 
Few bugs are now exposed...
This commit is contained in:
Denis Vlasenko
2006-09-27 23:31:08 +00:00
parent c16bd212e3
commit ce97960a6e
5 changed files with 88 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
archival/ar.c
View File

@@ -26,7 +26,8 @@ static void header_verbose_list_ar(const file_header_t *file_header)
mtime[16] = ' ';
memmove(&mtime[17], &mtime[20], 4);
mtime[21] = '\0';
printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name);
printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid,
(int) file_header->size, &mtime[4], file_header->name);
}
#define AR_CTX_PRINT 0x01

9
archival/bunzip2.c
View File

@@ -36,7 +36,8 @@ 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) {
@@ -45,7 +46,7 @@ int bunzip2_main(int argc, char **argv)
* strlen may be less than 4 */
char *extension = strrchr(filename, '.');
if (!extension || strcmp(extension, ".bz2") != 0) {
bb_error_msg_and_die("Invalid extension");
bb_error_msg_and_die("invalid extension");
}
xstat(filename, &stat_buf);
*extension = '\0';
@@ -53,10 +54,10 @@ int bunzip2_main(int argc, char **argv)
stat_buf.st_mode);
} else dst_fd = STDOUT_FILENO;
status = uncompressStream(src_fd, dst_fd);
if(filename) {
if (filename) {
if (!status) filename[strlen(filename)] = '.';
if (unlink(filename) < 0) {
bb_error_msg_and_die("Couldn't remove %s", filename);
bb_error_msg_and_die("cannot remove %s", filename);
}
}