use bb_fflush_stdout_and_exit instead of exit
[oweals/busybox.git] / coreutils / ls.c
index 8a2b5e138c9b5a092ee064c329001ff1a2299fa5..4e21454cef9af6d5e4dd91b38b2843c85d20a968 100644 (file)
@@ -61,70 +61,90 @@ enum {
 #include <signal.h>
 #include <termios.h>
 #include <sys/ioctl.h>
+#include <sys/sysmacros.h>     /* major() and minor() */
 #include "busybox.h"
+#ifdef CONFIG_SELINUX
+#include <fs_secure.h>
+#include <flask_util.h>
+#include <ss.h>
+#endif
 
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
 #include <time.h>
 #endif
 
-#ifndef MAJOR
-#define MAJOR(dev) (((dev)>>8)&0xff)
-#define MINOR(dev) ((dev)&0xff)
-#endif
-
 /* what is the overall style of the listing */
-enum {
-       STYLE_AUTO = 0,
-       STYLE_LONG = 1,         /* one record per line, extended info */
-       STYLE_SINGLE = 2,       /* one record per line */
-       STYLE_COLUMNS = 3       /* fill columns */
-};
+#define STYLE_AUTO      (0)
+#define STYLE_COLUMNS   (1U<<21)       /* fill columns */
+#define STYLE_LONG      (2U<<21)       /* one record per line, extended info */
+#define STYLE_SINGLE    (3U<<21)       /* one record per line */
+
+#define STYLE_MASK                 STYLE_SINGLE
+#define STYLE_ONE_RECORD_FLAG      STYLE_LONG
 
 /* 51306 lrwxrwxrwx  1 root     root         2 May 11 01:43 /bin/view -> vi* */
 /* what file information will be listed */
-#define LIST_INO               (1<<0)
-#define LIST_BLOCKS            (1<<1)
-#define LIST_MODEBITS  (1<<2)
-#define LIST_NLINKS            (1<<3)
-#define LIST_ID_NAME   (1<<4)
-#define LIST_ID_NUMERIC        (1<<5)
-#define LIST_SIZE              (1<<6)
-#define LIST_DEV               (1<<7)
-#define LIST_DATE_TIME (1<<8)
-#define LIST_FULLTIME  (1<<9)
-#define LIST_FILENAME  (1<<10)
-#define LIST_SYMLINK   (1<<11)
-#define LIST_FILETYPE  (1<<12)
-#define LIST_EXEC              (1<<13)
+#define LIST_INO               (1U<<0)
+#define LIST_BLOCKS            (1U<<1)
+#define LIST_MODEBITS  (1U<<2)
+#define LIST_NLINKS            (1U<<3)
+#define LIST_ID_NAME   (1U<<4)
+#define LIST_ID_NUMERIC        (1U<<5)
+#define LIST_CONTEXT   (1U<<6)
+#define LIST_SIZE              (1U<<7)
+#define LIST_DEV               (1U<<8)
+#define LIST_DATE_TIME (1U<<9)
+#define LIST_FULLTIME  (1U<<10)
+#define LIST_FILENAME  (1U<<11)
+#define LIST_SYMLINK   (1U<<12)
+#define LIST_FILETYPE  (1U<<13)
+#define LIST_EXEC      (1U<<14)
+
+#define LIST_MASK       ((LIST_EXEC << 1) - 1)
 
 /* what files will be displayed */
-#define DISP_NORMAL            (0)     /* show normal filenames */
-#define DISP_DIRNAME   (1<<0)  /* 2 or more items? label directories */
-#define DISP_HIDDEN            (1<<1)  /* show filenames starting with .  */
-#define DISP_DOT               (1<<2)  /* show . and .. */
-#define DISP_NOLIST            (1<<3)  /* show directory as itself, not contents */
-#define DISP_RECURSIVE (1<<4)  /* show directory and everything below it */
-#define DISP_ROWS              (1<<5)  /* print across rows */
+/* TODO -- We may be able to make DISP_NORMAL 0 to save a bit slot. */
+#define DISP_NORMAL            (1U<<14)        /* show normal filenames */
+#define DISP_DIRNAME   (1U<<15)        /* 2 or more items? label directories */
+#define DISP_HIDDEN            (1U<<16)        /* show filenames starting with .  */
+#define DISP_DOT               (1U<<17)        /* show . and .. */
+#define DISP_NOLIST            (1U<<18)        /* show directory as itself, not contents */
+#define DISP_RECURSIVE (1U<<19)        /* show directory and everything below it */
+#define DISP_ROWS              (1U<<20)        /* print across rows */
+
+#define DISP_MASK       (((DISP_ROWS << 1) - 1) & ~(DISP_NORMAL - 1))
 
 #ifdef CONFIG_FEATURE_LS_SORTFILES
 /* how will the files be sorted */
-static const int SORT_FORWARD = 0;     /* sort in reverse order */
-static const int SORT_REVERSE = 1;     /* sort in reverse order */
-static const int SORT_NAME = 2;        /* sort by file name */
-static const int SORT_SIZE = 3;        /* sort by file size */
-static const int SORT_ATIME = 4;       /* sort by last access time */
-static const int SORT_CTIME = 5;       /* sort by last change time */
-static const int SORT_MTIME = 6;       /* sort by last modification time */
-static const int SORT_VERSION = 7;     /* sort by version */
-static const int SORT_EXT = 8; /* sort by file name extension */
-static const int SORT_DIR = 9; /* sort by file or directory */
+#define SORT_ORDER_FORWARD   0                 /* sort in reverse order */
+#define SORT_ORDER_REVERSE   (1U<<27)  /* sort in reverse order */
+
+#define SORT_NAME      0                       /* sort by file name */
+#define SORT_SIZE      (1U<<28)                /* sort by file size */
+#define SORT_ATIME     (2U<<28)                /* sort by last access time */
+#define SORT_CTIME     (3U<<28)                /* sort by last change time */
+#define SORT_MTIME     (4U<<28)                /* sort by last modification time */
+#define SORT_VERSION   (5U<<28)                /* sort by version */
+#define SORT_EXT       (6U<<28)                /* sort by file name extension */
+#define SORT_DIR       (7U<<28)                /* sort by file or directory */
+
+#define SORT_MASK      (7U<<28)
 #endif
 
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
 /* which of the three times will be used */
-static const int TIME_MOD = 0;
-static const int TIME_CHANGE = 1;
-static const int TIME_ACCESS = 2;
+#define TIME_MOD       0
+#define TIME_CHANGE    (1U<<23)
+#define TIME_ACCESS    (1U<<24)
+
+#define TIME_MASK      (3U<<23)
+#endif
+
+#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
+#define FOLLOW_LINKS   (1U<<25)
+#endif
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+#define LS_DISP_HR     (1U<<26)
 #endif
 
 #define LIST_SHORT     (LIST_FILENAME)
@@ -133,9 +153,9 @@ static const int TIME_ACCESS = 2;
                                                LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK)
 #define LIST_ILONG     (LIST_INO | LIST_LONG)
 
-static const int SPLIT_DIR = 0;
-static const int SPLIT_FILE = 1;
-static const int SPLIT_SUBDIR = 2;
+#define SPLIT_DIR      1
+#define SPLIT_FILE     0
+#define SPLIT_SUBDIR   2
 
 #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
 #define TYPECHAR(mode)  ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)])
@@ -161,6 +181,9 @@ struct dnode {                      /* the basic node */
        char *name;                     /* the dir entry name */
        char *fullname;         /* the dir entry name */
        struct stat dstat;      /* the file stat info */
+#ifdef CONFIG_SELINUX
+       security_id_t sid;
+#endif
        struct dnode *next;     /* point at the next node */
 };
 typedef struct dnode dnode_t;
@@ -169,23 +192,14 @@ static struct dnode **list_dir(const char *);
 static struct dnode **dnalloc(int);
 static int list_single(struct dnode *);
 
-static unsigned int disp_opts;
-static unsigned int style_fmt;
-static unsigned int list_fmt;
+static unsigned int all_fmt;
 
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-static unsigned int sort_opts;
-static unsigned int sort_order;
-#endif
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-static unsigned int time_fmt;
-#endif
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-static unsigned int follow_links = FALSE;
+#ifdef CONFIG_SELINUX
+static int is_flask_enabled_flag;
 #endif
 
 #ifdef CONFIG_FEATURE_AUTOWIDTH
-static unsigned short terminal_width = TERMINAL_WIDTH;
+static int terminal_width = TERMINAL_WIDTH;
 static unsigned short tabstops = COLUMN_GAP;
 #else
 #define tabstops COLUMN_GAP
@@ -194,34 +208,53 @@ static unsigned short tabstops = COLUMN_GAP;
 
 static int status = EXIT_SUCCESS;
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-static unsigned long ls_disp_hr = 0;
-#endif
-
 static struct dnode *my_stat(char *fullname, char *name)
 {
        struct stat dstat;
        struct dnode *cur;
+#ifdef CONFIG_SELINUX
+       security_id_t sid;
+#endif
+       int rc;
 
 #ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-       if (follow_links) {
-               if (stat(fullname, &dstat)) {
-                       perror_msg("%s", fullname);
+       if (all_fmt & FOLLOW_LINKS) {
+#ifdef CONFIG_SELINUX
+               if(is_flask_enabled_flag)
+                       rc = stat_secure(fullname, &dstat, &sid);
+               else
+#endif
+                       rc = stat(fullname, &dstat);
+               if(rc)
+               {
+                       bb_perror_msg("%s", fullname);
                        status = EXIT_FAILURE;
                        return 0;
                }
        } else
 #endif
-       if (lstat(fullname, &dstat)) {
-               perror_msg("%s", fullname);
-               status = EXIT_FAILURE;
-       return 0;
+       {
+#ifdef CONFIG_SELINUX
+               if(is_flask_enabled_flag)
+                       rc = lstat_secure(fullname, &dstat, &sid);
+               else
+#endif
+                       rc = lstat(fullname, &dstat);
+               if(rc)
+               {
+                       bb_perror_msg("%s", fullname);
+                       status = EXIT_FAILURE;
+                       return 0;
+               }
        }
 
        cur = (struct dnode *) xmalloc(sizeof(struct dnode));
        cur->fullname = fullname;
        cur->name = name;
        cur->dstat = dstat;
+#ifdef CONFIG_SELINUX
+       cur->sid = sid;
+#endif
        return cur;
 }
 
@@ -253,9 +286,9 @@ static char bgcolor(mode_t mode)
 #if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
 static char append_char(mode_t mode)
 {
-       if (!(list_fmt & LIST_FILETYPE))
+       if (!(all_fmt & LIST_FILETYPE))
                return '\0';
-       if ((list_fmt & LIST_EXEC) && S_ISREG(mode)
+       if ((all_fmt & LIST_EXEC) && S_ISREG(mode)
                && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
                return '*';
        return APPCHAR(mode);
@@ -263,13 +296,11 @@ static char append_char(mode_t mode)
 #endif
 
 /*----------------------------------------------------------------------*/
-static int is_subdir(struct dnode *dn)
-{
-       return (S_ISDIR(dn->dstat.st_mode) && strcmp(dn->name, ".") != 0 &&
-                       strcmp(dn->name, "..") != 0);
-}
 
-static int countdirs(struct dnode **dn, int nfiles)
+#define countdirs(A,B) count_dirs((A), (B), 1)
+#define countsubdirs(A,B) count_dirs((A), (B), 0)
+
+static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs)
 {
        int i, dirs;
 
@@ -277,25 +308,17 @@ static int countdirs(struct dnode **dn, int nfiles)
                return (0);
        dirs = 0;
        for (i = 0; i < nfiles; i++) {
-               if (S_ISDIR(dn[i]->dstat.st_mode))
+               if (S_ISDIR(dn[i]->dstat.st_mode)
+                       && (notsubdirs
+                               || ((dn[i]->name[0] != '.')
+                                       || (dn[i]->name[1]
+                                               && ((dn[i]->name[1] != '.')
+                                                       || dn[i]->name[2])))))
                        dirs++;
        }
        return (dirs);
 }
 
-static int countsubdirs(struct dnode **dn, int nfiles)
-{
-       int i, subdirs;
-
-       if (dn == NULL || nfiles < 1)
-               return 0;
-       subdirs = 0;
-       for (i = 0; i < nfiles; i++)
-               if (is_subdir(dn[i]))
-                       subdirs++;
-       return subdirs;
-}
-
 static int countfiles(struct dnode **dnp)
 {
        int nfiles;
@@ -364,18 +387,18 @@ static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
 
        /* copy the entrys into the file or dir array */
        for (d = i = 0; i < nfiles; i++) {
-               if (which == SPLIT_DIR) {
-                       if (S_ISDIR(dn[i]->dstat.st_mode)) {
-                               dnp[d++] = dn[i];
-                       }                       /* else skip the file */
-               } else if (which == SPLIT_SUBDIR) {
-                       if (is_subdir(dn[i])) {
-                               dnp[d++] = dn[i];
-                       }                       /* else skip the file or dir */
-               } else {
-                       if (!(S_ISDIR(dn[i]->dstat.st_mode))) {
-                               dnp[d++] = dn[i];
-                       }                       /* else skip the dir */
+               if (S_ISDIR(dn[i]->dstat.st_mode)) {
+                       if (which & (SPLIT_DIR|SPLIT_SUBDIR)) {
+                               if ((which & SPLIT_DIR)
+                                       || ((dn[i]->name[0] != '.')
+                                               || (dn[i]->name[1]
+                                                       && ((dn[i]->name[1] != '.')
+                                                               || dn[i]->name[2])))) {
+                                                                       dnp[d++] = dn[i];
+                                                               }
+                       }
+               } else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) {
+                       dnp[d++] = dn[i];
                }
        }
        return (dnp);
@@ -385,29 +408,24 @@ static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
 #ifdef CONFIG_FEATURE_LS_SORTFILES
 static int sortcmp(struct dnode *d1, struct dnode *d2)
 {
-       int cmp, dif;
+       unsigned int sort_opts = all_fmt & SORT_MASK;
+       int dif;
 
-       cmp = 0;
+       dif = 0;                        /* assume SORT_NAME */
        if (sort_opts == SORT_SIZE) {
-               dif = (int) (d1->dstat.st_size - d2->dstat.st_size);
+               dif = (int) (d2->dstat.st_size - d1->dstat.st_size);
        } else if (sort_opts == SORT_ATIME) {
-               dif = (int) (d1->dstat.st_atime - d2->dstat.st_atime);
+               dif = (int) (d2->dstat.st_atime - d1->dstat.st_atime);
        } else if (sort_opts == SORT_CTIME) {
-               dif = (int) (d1->dstat.st_ctime - d2->dstat.st_ctime);
+               dif = (int) (d2->dstat.st_ctime - d1->dstat.st_ctime);
        } else if (sort_opts == SORT_MTIME) {
-               dif = (int) (d1->dstat.st_mtime - d2->dstat.st_mtime);
+               dif = (int) (d2->dstat.st_mtime - d1->dstat.st_mtime);
        } else if (sort_opts == SORT_DIR) {
-               dif = S_ISDIR(d1->dstat.st_mode) - S_ISDIR(d2->dstat.st_mode);
+               dif = S_ISDIR(d2->dstat.st_mode) - S_ISDIR(d1->dstat.st_mode);
                /* } else if (sort_opts == SORT_VERSION) { */
                /* } else if (sort_opts == SORT_EXT) { */
-       } else {                        /* assume SORT_NAME */
-               dif = 0;
        }
 
-       if (dif > 0)
-               cmp = -1;
-       if (dif < 0)
-               cmp = 1;
        if (dif == 0) {
                /* sort by name- may be a tie_breaker for time or size cmp */
 #ifdef CONFIG_LOCALE_SUPPORT
@@ -415,16 +433,12 @@ static int sortcmp(struct dnode *d1, struct dnode *d2)
 #else
                dif = strcmp(d1->name, d2->name);
 #endif
-               if (dif > 0)
-                       cmp = 1;
-               if (dif < 0)
-                       cmp = -1;
        }
 
-       if (sort_order == SORT_REVERSE) {
-               cmp = -1 * cmp;
+       if (all_fmt & SORT_ORDER_REVERSE) {
+               dif = -dif;
        }
-       return (cmp);
+       return (dif);
 }
 
 /*----------------------------------------------------------------------*/
@@ -463,20 +477,20 @@ static void showfiles(struct dnode **dn, int nfiles)
        if (dn == NULL || nfiles < 1)
                return;
 
-       switch (style_fmt) {
-       case STYLE_LONG:        /* one record per line, extended info */
-       case STYLE_SINGLE:      /* one record per line */
+       if (all_fmt & STYLE_ONE_RECORD_FLAG) {
                ncols = 1;
-               break;
-       default:
-       /* find the longest file name-  use that as the column width */
-       for (i = 0; i < nfiles; i++) {
+       } else {
+               /* find the longest file name-  use that as the column width */
+               for (i = 0; i < nfiles; i++) {
                        int len = strlen(dn[i]->name) +
-                       ((list_fmt & LIST_INO) ? 8 : 0) +
-                       ((list_fmt & LIST_BLOCKS) ? 5 : 0);
-               if (column_width < len)
-                       column_width = len;
-       }
+#ifdef CONFIG_SELINUX
+                       ((all_fmt & LIST_CONTEXT) ? 33 : 0) +
+#endif
+                       ((all_fmt & LIST_INO) ? 8 : 0) +
+                       ((all_fmt & LIST_BLOCKS) ? 5 : 0);
+                       if (column_width < len)
+                               column_width = len;
+               }
                column_width += tabstops;
                ncols = (int) (terminal_width / column_width);
        }
@@ -494,7 +508,7 @@ static void showfiles(struct dnode **dn, int nfiles)
                for (nc = 0; nc < ncols; nc++) {
                        /* reach into the array based on the column and row */
                        i = (nc * nrows) + row; /* assume display by column */
-                       if (disp_opts & DISP_ROWS)
+                       if (all_fmt & DISP_ROWS)
                                i = (row * ncols) + nc; /* display across row */
                        if (i < nfiles) {
                                if (column > 0) {
@@ -514,7 +528,7 @@ static void showfiles(struct dnode **dn, int nfiles)
 }
 
 /*----------------------------------------------------------------------*/
-static void showdirs(struct dnode **dn, int ndirs)
+static void showdirs(struct dnode **dn, int ndirs, int first)
 {
        int i, nfiles;
        struct dnode **subdnp;
@@ -528,8 +542,11 @@ static void showdirs(struct dnode **dn, int ndirs)
                return;
 
        for (i = 0; i < ndirs; i++) {
-               if (disp_opts & (DISP_DIRNAME | DISP_RECURSIVE)) {
-                       printf("\n%s:\n", dn[i]->fullname);
+               if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
+                       if (!first)
+                               printf("\n");
+                       first = 0;
+                       printf("%s:\n", dn[i]->fullname);
                }
                subdnp = list_dir(dn[i]->fullname);
                nfiles = countfiles(subdnp);
@@ -540,7 +557,7 @@ static void showdirs(struct dnode **dn, int ndirs)
 #endif
                        showfiles(subdnp, nfiles);
 #ifdef CONFIG_FEATURE_LS_RECURSIVE
-                       if (disp_opts & DISP_RECURSIVE) {
+                       if (all_fmt & DISP_RECURSIVE) {
                                /* recursive- list the sub-dirs */
                                dnd = splitdnarray(subdnp, nfiles, SPLIT_SUBDIR);
                                dndirs = countsubdirs(subdnp, nfiles);
@@ -548,7 +565,7 @@ static void showdirs(struct dnode **dn, int ndirs)
 #ifdef CONFIG_FEATURE_LS_SORTFILES
                                        shellsort(dnd, dndirs);
 #endif
-                                       showdirs(dnd, dndirs);
+                                       showdirs(dnd, dndirs, 0);
                                        free(dnd);      /* free the array of dnode pointers to the dirs */
                                }
                        }
@@ -573,7 +590,7 @@ static struct dnode **list_dir(const char *path)
        nfiles = 0;
        dir = opendir(path);
        if (dir == NULL) {
-               perror_msg("%s", path);
+               bb_perror_msg("%s", path);
                status = EXIT_FAILURE;
                return (NULL);  /* could not open the dir */
        }
@@ -585,9 +602,9 @@ static struct dnode **list_dir(const char *path)
                        if ((entry->d_name[1] == 0 || (
                                entry->d_name[1] == '.'
                                && entry->d_name[2] == 0))
-                                       && !(disp_opts & DISP_DOT))
+                                       && !(all_fmt & DISP_DOT))
                        continue;
-                       if (!(disp_opts & DISP_HIDDEN))
+                       if (!(all_fmt & DISP_HIDDEN))
                        continue;
                }
                fullname = concat_path_file(path, entry->d_name);
@@ -636,9 +653,9 @@ static int list_single(struct dnode *dn)
 
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
        ttime = dn->dstat.st_mtime;     /* the default time */
-       if (time_fmt & TIME_ACCESS)
+       if (all_fmt & TIME_ACCESS)
                ttime = dn->dstat.st_atime;
-       if (time_fmt & TIME_CHANGE)
+       if (all_fmt & TIME_CHANGE)
                ttime = dn->dstat.st_ctime;
        filetime = ctime(&ttime);
 #endif
@@ -647,7 +664,7 @@ static int list_single(struct dnode *dn)
 #endif
 
        for (i = 0; i <= 31; i++) {
-               switch (list_fmt & (1 << i)) {
+               switch (all_fmt & (1 << i)) {
                case LIST_INO:
                        column += printf("%7ld ", (long int) dn->dstat.st_ino);
                        break;
@@ -659,16 +676,16 @@ static int list_single(struct dnode *dn)
 #endif
                        break;
                case LIST_MODEBITS:
-                       column += printf("%-10s ", (char *) mode_string(dn->dstat.st_mode));
+                       column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode));
                        break;
                case LIST_NLINKS:
                        column += printf("%4ld ", (long) dn->dstat.st_nlink);
                        break;
                case LIST_ID_NAME:
 #ifdef CONFIG_FEATURE_LS_USERNAME
-                       my_getpwuid(scratch, dn->dstat.st_uid);
+                       my_getpwuid(scratch, dn->dstat.st_uid, sizeof(scratch));
                        printf("%-8.8s ", scratch);
-                       my_getgrgid(scratch, dn->dstat.st_gid);
+                       my_getgrgid(scratch, dn->dstat.st_gid, sizeof(scratch));
                        printf("%-8.8s", scratch);
                        column += 17;
                        break;
@@ -679,11 +696,11 @@ static int list_single(struct dnode *dn)
                case LIST_SIZE:
                case LIST_DEV:
                        if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) {
-                               column += printf("%4d, %3d ", (int) MAJOR(dn->dstat.st_rdev),
-                                          (int) MINOR(dn->dstat.st_rdev));
+                               column += printf("%4d, %3d ", (int) major(dn->dstat.st_rdev),
+                                          (int) minor(dn->dstat.st_rdev));
                        } else {
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-                               if (ls_disp_hr == TRUE) {
+                               if (all_fmt & LS_DISP_HR) {
                                        column += printf("%9s ",
                                                        make_human_readable_str(dn->dstat.st_size, 1, 0));
                                } else
@@ -699,21 +716,36 @@ static int list_single(struct dnode *dn)
                        break;
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
                case LIST_FULLTIME:
+                       printf("%24.24s ", filetime);
+                       column += 25;
+                       break;
                case LIST_DATE_TIME:
-                       if (list_fmt & LIST_FULLTIME) {
-                               printf("%24.24s ", filetime);
-                               column += 25;
-                               break;
+                       if ((all_fmt & LIST_FULLTIME) == 0) {
+                               age = time(NULL) - ttime;
+                               printf("%6.6s ", filetime + 4);
+                               if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
+                                       /* hh:mm if less than 6 months old */
+                                       printf("%5.5s ", filetime + 11);
+                               } else {
+                                       printf(" %4.4s ", filetime + 20);
+                               }
+                               column += 13;
                        }
-                       age = time(NULL) - ttime;
-                       printf("%6.6s ", filetime + 4);
-                       if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
-                               /* hh:mm if less than 6 months old */
-                               printf("%5.5s ", filetime + 11);
-                       } else {
-                               printf(" %4.4s ", filetime + 20);
+                       break;
+#endif
+#ifdef CONFIG_SELINUX
+               case LIST_CONTEXT:
+                       {
+                               char context[64];
+                               int len = sizeof(context);
+                               if(security_sid_to_context(dn->sid, context, &len))
+                               {
+                                       strcpy(context, "unknown");
+                                       len = 7;
+                               }
+                               printf("%-32s ", context);
+                               column += MAX(33, len);
                        }
-                       column += 13;
                        break;
 #endif
                case LIST_FILENAME:
@@ -774,198 +806,260 @@ static int list_single(struct dnode *dn)
 }
 
 /*----------------------------------------------------------------------*/
-extern int ls_main(int argc, char **argv)
-{
-       struct dnode **dnf, **dnd;
-       int dnfiles, dndirs;
-       struct dnode *dn, *cur, **dnp;
-       int i, nfiles;
-       int opt;
-       int oi, ac;
-       char **av;
 
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-       struct winsize win = { 0, 0, 0, 0 };
+/* "[-]Cadil1", POSIX mandated options, busybox always supports */
+/* "[-]gnsx", POSIX non-mandated options, busybox always supports */
+/* "[-]Ak" GNU options, busybox always supports */
+/* "[-]FLRctur", POSIX mandated options, busybox optionally supports */
+/* "[-]p", POSIX non-mandated options, busybox optionally supports */
+/* "[-]SXvThw", GNU options, busybox optionally supports */
+/* "[-]K", SELinux mandated options, busybox optionally supports */
+/* "[-]e", I think we made this one up */
+
+#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+# define LS_STR_TIMESTAMPS     "cetu"
+#else
+# define LS_STR_TIMESTAMPS     ""
 #endif
 
-       disp_opts = DISP_NORMAL;
-       style_fmt = STYLE_AUTO;
-       list_fmt = LIST_SHORT;
 #ifdef CONFIG_FEATURE_LS_SORTFILES
-       sort_opts = SORT_NAME;
-       sort_order = SORT_FORWARD;
+# define LS_STR_SORTFILES      "SXrv"
+#else
+# define LS_STR_SORTFILES      ""
 #endif
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-       time_fmt = TIME_MOD;
+
+#ifdef CONFIG_FEATURE_LS_FILETYPES
+# define LS_STR_FILETYPES      "Fp"
+#else
+# define LS_STR_FILETYPES      ""
 #endif
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-       ioctl(fileno(stdout), TIOCGWINSZ, &win);
-       if (win.ws_col > 0)
-               terminal_width = win.ws_col - 1;
+
+#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
+# define LS_STR_FOLLOW_LINKS   "L"
+#else
+# define LS_STR_FOLLOW_LINKS   ""
 #endif
-       nfiles = 0;
 
-#ifdef CONFIG_FEATURE_LS_COLOR
-       if (isatty(fileno(stdout)))
-               show_color = 1;
+#ifdef CONFIG_FEATURE_LS_RECURSIVE
+# define LS_STR_RECURSIVE      "R"
+#else
+# define LS_STR_RECURSIVE      ""
 #endif
 
-       /* process options */
-       while ((opt = getopt(argc, argv, "1AaCdgilnsx"
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-                                                "T:w:"
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+# define LS_STR_HUMAN_READABLE "h"
+#else
+# define LS_STR_HUMAN_READABLE ""
 #endif
-#ifdef CONFIG_FEATURE_LS_FILETYPES
-                                                "Fp"
+
+#ifdef CONFIG_SELINUX
+# define LS_STR_SELINUX        "K"
+#else
+# define LS_STR_SELINUX        ""
 #endif
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
-                                                "R"
+
+#ifdef CONFIG_FEATURE_AUTOWIDTH
+# define LS_STR_AUTOWIDTH      "T:w:"
+#else
+# define LS_STR_AUTOWIDTH      ""
+#endif
+
+static const char ls_options[]="Cadil1gnsxAk" \
+       LS_STR_TIMESTAMPS \
+       LS_STR_SORTFILES \
+       LS_STR_FILETYPES \
+       LS_STR_FOLLOW_LINKS \
+       LS_STR_RECURSIVE \
+       LS_STR_HUMAN_READABLE \
+       LS_STR_SELINUX \
+       LS_STR_AUTOWIDTH;
+
+#define LIST_MASK_TRIGGER      0
+#define STYLE_MASK_TRIGGER     STYLE_MASK
+#define SORT_MASK_TRIGGER      SORT_MASK
+#define DISP_MASK_TRIGGER      DISP_ROWS
+#define TIME_MASK_TRIGGER      TIME_MASK
+
+static const unsigned opt_flags[] = {
+       LIST_SHORT | STYLE_COLUMNS,     /* C */
+       DISP_HIDDEN | DISP_DOT,         /* a */
+       DISP_NOLIST,                    /* d */
+       LIST_INO,                       /* i */
+       LIST_LONG | STYLE_LONG,         /* l - remember LS_DISP_HR in mask! */
+       LIST_SHORT | STYLE_SINGLE,      /* 1 */
+       0,                              /* g - ingored */
+       LIST_ID_NUMERIC,                /* n */
+       LIST_BLOCKS,                    /* s */
+       DISP_ROWS,                      /* x */
+       DISP_HIDDEN,                    /* A */
+#ifdef CONFIG_SELINUX
+       LIST_CONTEXT,                   /* k */
+#else
+       0,                              /* k - ingored */
+#endif
+#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+# ifdef CONFIG_FEATURE_LS_SORTFILES
+       TIME_CHANGE | SORT_CTIME,       /* c */
+# else
+       TIME_CHANGE,                    /* c */
+# endif
+       LIST_FULLTIME,                  /* e */
+# ifdef CONFIG_FEATURE_LS_SORTFILES
+       SORT_MTIME,                     /* t */
+# else
+       0,                              /* t - ignored -- is this correct? */
+# endif
+# ifdef CONFIG_FEATURE_LS_SORTFILES
+       TIME_ACCESS | SORT_ATIME,       /* u */
+# else
+       TIME_ACCESS,                    /* u */
+# endif
 #endif
 #ifdef CONFIG_FEATURE_LS_SORTFILES
-                                                "rSvX"
+       SORT_SIZE,                      /* S */
+       SORT_EXT,                       /* X */
+       SORT_ORDER_REVERSE,             /* r */
+       SORT_VERSION,                   /* v */
 #endif
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-                                                "cetu"
+#ifdef CONFIG_FEATURE_LS_FILETYPES
+       LIST_FILETYPE | LIST_EXEC,      /* F */
+       LIST_FILETYPE,                  /* p */
 #endif
 #ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-                                                "L"
+       FOLLOW_LINKS,                   /* L */
 #endif
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-                                                "h"
+#ifdef CONFIG_FEATURE_LS_RECURSIVE
+       DISP_RECURSIVE,                 /* R */
 #endif
-                                                "k")) > 0) {
-               switch (opt) {
-               case '1':
-                       style_fmt = STYLE_SINGLE;
-                       break;
-               case 'A':
-                       disp_opts |= DISP_HIDDEN;
-                       break;
-               case 'a':
-                       disp_opts |= DISP_HIDDEN | DISP_DOT;
-                       break;
-               case 'C':
-                       style_fmt = STYLE_COLUMNS;
-                       break;
-               case 'd':
-                       disp_opts |= DISP_NOLIST;
-                       break;
-               case 'g':               /* ignore -- for ftp servers */
-                       break;
-               case 'i':
-                       list_fmt |= LIST_INO;
-                       break;
-               case 'l':
-                       style_fmt = STYLE_LONG;
-                       list_fmt |= LIST_LONG;
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-                       ls_disp_hr = FALSE;
+       LS_DISP_HR,                     /* h */
 #endif
-                       break;
-               case 'n':
-                       list_fmt |= LIST_ID_NUMERIC;
-                       break;
-               case 's':
-                       list_fmt |= LIST_BLOCKS;
-                       break;
-               case 'x':
-                       disp_opts = DISP_ROWS;
-                       break;
-#ifdef CONFIG_FEATURE_LS_FILETYPES
-               case 'F':
-                       list_fmt |= LIST_FILETYPE | LIST_EXEC;
-                       break;
-               case 'p':
-                       list_fmt |= LIST_FILETYPE;
-                       break;
+#ifdef CONFIG_SELINUX
+       LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
 #endif
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
-               case 'R':
-                       disp_opts |= DISP_RECURSIVE;
-                       break;
+       (1U<<31)
+};
+
+
+/*----------------------------------------------------------------------*/
+
+extern int ls_main(int argc, char **argv)
+{
+       struct dnode **dnd;
+       struct dnode **dnf;
+       struct dnode **dnp;
+       struct dnode *dn;
+       struct dnode *cur;
+       long opt;
+       int nfiles = 0;
+       int dnfiles;
+       int dndirs;
+       int oi;
+       int ac;
+       int i;
+       char **av;
+#ifdef CONFIG_FEATURE_AUTOWIDTH
+       char *tabstops_str = NULL;
+       char *terminal_width_str = NULL;
 #endif
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-               case 'r':
-                       sort_order |= SORT_REVERSE;
-                       break;
-               case 'S':
-                       sort_opts = SORT_SIZE;
-                       break;
-               case 'v':
-                       sort_opts = SORT_VERSION;
-                       break;
-               case 'X':
-                       sort_opts = SORT_EXT;
-                       break;
+
+#ifdef CONFIG_SELINUX
+       is_flask_enabled_flag = is_flask_enabled();
 #endif
+
+       all_fmt = LIST_SHORT | DISP_NORMAL | STYLE_AUTO
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-               case 'e':
-                       list_fmt |= LIST_FULLTIME;
-                       break;
-               case 'c':
-                       time_fmt = TIME_CHANGE;
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                       sort_opts = SORT_CTIME;
+               | TIME_MOD
 #endif
-                       break;
-               case 'u':
-                       time_fmt = TIME_ACCESS;
 #ifdef CONFIG_FEATURE_LS_SORTFILES
-                       sort_opts = SORT_ATIME;
+               | SORT_NAME | SORT_ORDER_FORWARD
 #endif
-                       break;
-               case 't':
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                       sort_opts = SORT_MTIME;
-#endif
-                       break;
+               ;
+
+#ifdef CONFIG_FEATURE_AUTOWIDTH
+       /* Obtain the terminal width.  */
+       get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL);
+       /* Go one less... */
+       terminal_width--;
 #endif
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-               case 'L':
-                       follow_links = TRUE;
-                       break;
+
+#ifdef CONFIG_FEATURE_LS_COLOR
+       if (isatty(STDOUT_FILENO))
+               show_color = 1;
 #endif
+
+       /* process options */
 #ifdef CONFIG_FEATURE_AUTOWIDTH
-               case 'T':
-                       tabstops = atoi(optarg);
-                       break;
-               case 'w':
-                       terminal_width = atoi(optarg);
-                       break;
+       opt = bb_getopt_ulflags(argc, argv, ls_options, &tabstops_str, &terminal_width_str);
+       if (tabstops_str) {
+               tabstops = atoi(tabstops_str);
+       }
+       if (terminal_width_str) {
+               terminal_width = atoi(terminal_width_str);
+       }
+#else
+       opt = bb_getopt_ulflags(argc, argv, ls_options);
+#endif
+       for (i = 0; opt_flags[i] != (1U<<31); i++) {
+               if (opt & (1 << i)) {
+                       unsigned int flags = opt_flags[i];
+                       if (flags & LIST_MASK_TRIGGER) {
+                               all_fmt &= ~LIST_MASK;
+                       }
+                       if (flags & STYLE_MASK_TRIGGER) {
+                               all_fmt &= ~STYLE_MASK;
+                       }
+#ifdef CONFIG_FEATURE_LS_SORTFILES
+                       if (flags & SORT_MASK_TRIGGER) {
+                               all_fmt &= ~SORT_MASK;
+                       }
+#endif
+                       if (flags & DISP_MASK_TRIGGER) {
+                               all_fmt &= ~DISP_MASK;
+                       }
+#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+                       if (flags & TIME_MASK_TRIGGER) {
+                               all_fmt &= ~TIME_MASK;
+                       }
 #endif
+                       if (flags & LIST_CONTEXT) {
+                               all_fmt |= STYLE_SINGLE;
+                       }
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-               case 'h':
-                       ls_disp_hr = TRUE;
-                       break;
+                       if (opt == 'l') {
+                               all_fmt &= ~LS_DISP_HR;
+                       }
 #endif
-               case 'k':
-                       break;
-               default:
-                       goto print_usage_message;
+                       all_fmt |= flags;
                }
        }
 
        /* sort out which command line options take precedence */
 #ifdef CONFIG_FEATURE_LS_RECURSIVE
-       if (disp_opts & DISP_NOLIST)
-               disp_opts &= ~DISP_RECURSIVE;   /* no recurse if listing only dir */
+       if (all_fmt & DISP_NOLIST)
+               all_fmt &= ~DISP_RECURSIVE;     /* no recurse if listing only dir */
 #endif
 #if defined (CONFIG_FEATURE_LS_TIMESTAMPS) && defined (CONFIG_FEATURE_LS_SORTFILES)
-       if (time_fmt & TIME_CHANGE)
-               sort_opts = SORT_CTIME;
-       if (time_fmt & TIME_ACCESS)
-               sort_opts = SORT_ATIME;
+       if (all_fmt & TIME_CHANGE)
+               all_fmt = (all_fmt & ~SORT_MASK) | SORT_CTIME;
+       if (all_fmt & TIME_ACCESS)
+               all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME;
 #endif
-       if (style_fmt != STYLE_LONG)
-               list_fmt &= ~LIST_ID_NUMERIC;   /* numeric uid only for long list */
+       if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */
+               all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC);
 #ifdef CONFIG_FEATURE_LS_USERNAME
-       if (style_fmt == STYLE_LONG && (list_fmt & LIST_ID_NUMERIC))
-               list_fmt &= ~LIST_ID_NAME;      /* don't list names if numeric uid */
+       if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
+               all_fmt &= ~LIST_ID_NAME;       /* don't list names if numeric uid */
 #endif
 
        /* choose a display format */
-       if (style_fmt == STYLE_AUTO)
-               style_fmt = isatty(fileno(stdout)) ? STYLE_COLUMNS : STYLE_SINGLE;
+       if ((all_fmt & STYLE_MASK) == STYLE_AUTO)
+#if STYLE_AUTO != 0
+               all_fmt = (all_fmt & ~STYLE_MASK)
+                               | (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE);
+#else
+               all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE);
+#endif
 
        /*
         * when there are no cmd line args we have to supply a default "." arg.
@@ -977,7 +1071,7 @@ extern int ls_main(int argc, char **argv)
        ac = argc - optind;     /* how many cmd line args are left */
        if (ac < 1) {
                av = (char **) xcalloc((size_t) 1, (size_t) (sizeof(char *)));
-               av[0] = xstrdup(".");
+               av[0] = bb_xstrdup(".");
                ac = 1;
        } else {
                av = (char **) xcalloc((size_t) ac, (size_t) (sizeof(char *)));
@@ -988,12 +1082,12 @@ extern int ls_main(int argc, char **argv)
 
        /* now, everything is in the av array */
        if (ac > 1)
-               disp_opts |= DISP_DIRNAME;      /* 2 or more items? label directories */
+               all_fmt |= DISP_DIRNAME;        /* 2 or more items? label directories */
 
        /* stuff the command line file names into an dnode array */
        dn = NULL;
        for (oi = 0; oi < ac; oi++) {
-               char *fullname = xstrdup(av[oi]);
+               char *fullname = bb_xstrdup(av[oi]);
 
                cur = my_stat(fullname, fullname);
                if (!cur)
@@ -1012,8 +1106,7 @@ extern int ls_main(int argc, char **argv)
                cur = cur->next;
        }
 
-
-       if (disp_opts & DISP_NOLIST) {
+       if (all_fmt & DISP_NOLIST) {
 #ifdef CONFIG_FEATURE_LS_SORTFILES
                shellsort(dnp, nfiles);
 #endif
@@ -1034,11 +1127,8 @@ extern int ls_main(int argc, char **argv)
 #ifdef CONFIG_FEATURE_LS_SORTFILES
                        shellsort(dnd, dndirs);
 #endif
-                       showdirs(dnd, dndirs);
+                       showdirs(dnd, dndirs, dnfiles == 0);
                }
        }
        return (status);
-
-  print_usage_message:
-       show_usage();
 }