summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-03-19 20:59:20 +0000
committerDenis Vlasenko2007-03-19 20:59:20 +0000
commit97fd6d81b4f101a32c31c4711fb43d0f5c78c47b (patch)
tree19b05ece7934d71f90b490cff52fdceb39e62f92
parent6111a8f2e737fea9147cb3fb21613d32d34788bd (diff)
downloadbusybox-97fd6d81b4f101a32c31c4711fb43d0f5c78c47b.zip
busybox-97fd6d81b4f101a32c31c4711fb43d0f5c78c47b.tar.gz
ls: fix segfault-if-standalone-shell, add big fat comment.
-rw-r--r--archival/libunarchive/get_header_ar.c2
-rw-r--r--coreutils/ls.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index a8a595e..c691f1b 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -66,9 +66,9 @@ char get_header_ar(archive_handle_t *archive_handle)
/* long filenames have '/' as the first character */
if (ar.formatted.name[0] == '/') {
+#if ENABLE_FEATURE_AR_LONG_FILENAMES
unsigned long_offset;
-#if ENABLE_FEATURE_AR_LONG_FILENAMES
if (ar.formatted.name[1] == '/') {
/* If the second char is a '/' then this entries data section
* stores long filename for multiple entries, they are stored
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1c1544a..2e68eb8 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -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)
{
@@ -797,8 +800,6 @@ int ls_main(int argc, char **argv)
USE_FEATURE_AUTOWIDTH(char *terminal_width_str = NULL;)
USE_FEATURE_LS_COLOR(char *color_opt;)
- setvbuf(stdout, bb_common_bufsiz1, _IOFBF, BUFSIZ);
-
#if ENABLE_FEATURE_LS_TIMESTAMPS
time(&current_time_t);
#endif