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

ls: fix segfault-if-standalone-shell, add big fat comment.

Browse Source
This commit is contained in:
Denis Vlasenko
2007-03-19 20:59:20 +00:00
parent 6111a8f2e7
commit 97fd6d81b4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
archival/libunarchive/get_header_ar.c
View File

@ -66,9 +66,9 @@ char get_header_ar(archive_handle_t *archive_handle)
/* long filenames have '/' as the first character */ /* long filenames have '/' as the first character */
if (ar.formatted.name[0] == '/') { if (ar.formatted.name[0] == '/') {
#if ENABLE_FEATURE_AR_LONG_FILENAMES
unsigned long_offset; unsigned long_offset;
#if ENABLE_FEATURE_AR_LONG_FILENAMES
if (ar.formatted.name[1] == '/') { if (ar.formatted.name[1] == '/') {
/* If the second char is a '/' then this entries data section /* If the second char is a '/' then this entries data section
* stores long filename for multiple entries, they are stored * stores long filename for multiple entries, they are stored

5
coreutils/ls.c
View File

@ -777,6 +777,9 @@ static const unsigned opt_flags[] = {
}; };
/* THIS IS A "SAFE" APPLET, main() MAY BE CALLED INTERNALLY FROM SHELL */
/* BE CAREFUL! */
int ls_main(int argc, char **argv); int ls_main(int argc, char **argv);
int ls_main(int argc, char **argv) int ls_main(int argc, char **argv)
{ {
@ -797,8 +800,6 @@ int ls_main(int argc, char **argv)
USE_FEATURE_AUTOWIDTH(char *terminal_width_str = NULL;) USE_FEATURE_AUTOWIDTH(char *terminal_width_str = NULL;)
USE_FEATURE_LS_COLOR(char *color_opt;) USE_FEATURE_LS_COLOR(char *color_opt;)
setvbuf(stdout, bb_common_bufsiz1, _IOFBF, BUFSIZ);
#if ENABLE_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
time(&current_time_t); time(&current_time_t);
#endif #endif