aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2000-10-28 01:21:22 +0000
committerMatt Kraai <kraai@debian.org>2000-10-28 01:21:22 +0000
commitb273d6651813363d95fd08686d380db8eacf87c1 (patch)
treee66b6da6af18e771e268fb6bd1b82ea043070408
parentc559d3077650fa2d8b8803d552342acdcf367217 (diff)
downloadbusybox-b273d6651813363d95fd08686d380db8eacf87c1.tar.gz
We also need to declare info if the USERNAMES feature is enabled.
-rw-r--r--coreutils/ls.c6
-rw-r--r--ls.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 4377256f6..b7329dfdf 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -433,7 +433,7 @@ void showdirs(struct dnode **dn, int ndirs)
{
int i, nfiles;
struct dnode **subdnp;
-#ifdef BB_FEATURE_LS_SORTFILES
+#ifdef BB_FEATURE_LS_RECURSIVE
int dndirs;
struct dnode **dnd;
#endif
@@ -529,8 +529,10 @@ int list_single(struct dnode *dn)
char *filetime;
time_t ttime, age;
#endif
-#ifdef BB_FEATURE_LS_FILETYPES
+#if defined (BB_FEATURE_LS_FILETYPES) || defined (BB_FEATURE_LS_USERNAME)
struct stat info;
+#endif
+#ifdef BB_FEATURE_LS_FILETYPES
char append;
#endif
diff --git a/ls.c b/ls.c
index 4377256f6..b7329dfdf 100644
--- a/ls.c
+++ b/ls.c
@@ -433,7 +433,7 @@ void showdirs(struct dnode **dn, int ndirs)
{
int i, nfiles;
struct dnode **subdnp;
-#ifdef BB_FEATURE_LS_SORTFILES
+#ifdef BB_FEATURE_LS_RECURSIVE
int dndirs;
struct dnode **dnd;
#endif
@@ -529,8 +529,10 @@ int list_single(struct dnode *dn)
char *filetime;
time_t ttime, age;
#endif
-#ifdef BB_FEATURE_LS_FILETYPES
+#if defined (BB_FEATURE_LS_FILETYPES) || defined (BB_FEATURE_LS_USERNAME)
struct stat info;
+#endif
+#ifdef BB_FEATURE_LS_FILETYPES
char append;
#endif