getopt_ulflags -> getopt32.
[oweals/busybox.git] / coreutils / ls.c
index bbc9114d244536e0f6ff8cb758eafed59adbbb9a..8ba4ab758ff41afee7ebc13cd60be252089c4007 100644 (file)
@@ -3,19 +3,7 @@
  * tiny-ls.c version 0.1.0: A minimalist 'ls'
  * Copyright (C) 1996 Brian Candler <B.Candler@pobox.com>
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /*
  */
 
 enum {
-       TERMINAL_WIDTH = 80,            /* use 79 if terminal has linefold bug */
-       COLUMN_WIDTH = 14,                      /* default if AUTOWIDTH not defined */
-       COLUMN_GAP = 2,                         /* includes the file type char */
+       TERMINAL_WIDTH = 80,    /* use 79 if terminal has linefold bug */
+       COLUMN_GAP = 2,         /* includes the file type char */
 };
 
-
 /************************************************************************/
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <sys/ioctl.h>
 #include "busybox.h"
-
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-#include <time.h>
-#endif
-
-#ifndef MAJOR
-#define MAJOR(dev) (((dev)>>8)&0xff)
-#define MINOR(dev) ((dev)&0xff)
-#endif
+#include <getopt.h>
 
 /* 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_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 */
+#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 */
 
-#ifdef CONFIG_FEATURE_LS_SORTFILES
+#define DISP_MASK       (((DISP_ROWS << 1) - 1) & ~(DISP_DIRNAME - 1))
+
+// 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 */
-#endif
+#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)
 
-#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_CHANGE    ((1U<<23) * ENABLE_FEATURE_LS_TIMESTAMPS)
+#define TIME_ACCESS    ((1U<<24) * ENABLE_FEATURE_LS_TIMESTAMPS)
+#define TIME_MASK      ((3U<<23) * ENABLE_FEATURE_LS_TIMESTAMPS)
+
+#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)
-#define LIST_ISHORT            (LIST_INO | LIST_FILENAME)
-#define LIST_LONG              (LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | \
-                                               LIST_SIZE | LIST_DATE_TIME | LIST_FILENAME | \
-                                               LIST_SYMLINK)
-#define LIST_ILONG             (LIST_INO | LIST_LONG)
+#define LIST_SHORT     (LIST_FILENAME)
+#define LIST_ISHORT    (LIST_INO | LIST_FILENAME)
+#define LIST_LONG      (LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
+                                               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)])
-#ifdef CONFIG_FEATURE_LS_FILETYPES
-#define APPCHAR(mode)   ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)])
+
+#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
+# define APPCHAR(mode)   ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)])
 #endif
+
 /* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
 #ifdef CONFIG_FEATURE_LS_COLOR
+
 static int show_color = 0;
-#define COLOR(mode)   ("\000\043\043\043\042\000\043\043"\
-                                          "\000\000\044\000\043\000\000\040" [TYPEINDEX(mode)])
-#define ATTR(mode)   ("\00\00\01\00\01\00\01\00"\
-                                         "\00\00\01\00\01\00\00\01" [TYPEINDEX(mode)])
+
+/* long option entry used only for --color, which has no short option
+ * equivalent.  */
+static const struct option ls_color_opt[] =
+{
+       {"color", optional_argument, NULL, 1},
+       {NULL, 0, NULL, 0}
+};
+
+#define COLOR(mode)    ("\000\043\043\043\042\000\043\043"\
+                        "\000\000\044\000\043\000\000\040" [TYPEINDEX(mode)])
+#define ATTR(mode)     ("\00\00\01\00\01\00\01\00"\
+                        "\00\00\01\00\01\00\00\01" [TYPEINDEX(mode)])
 #endif
 
 /*
  * a directory entry and its stat info are stored here
  */
-struct dnode {                         /* the basic node */
-    char *name;                                /* the dir entry name */
-    char *fullname;                    /* the dir entry name */
-    struct stat dstat;         /* the file stat info */
-    struct dnode *next;                /* point at the next node */
+struct dnode {                 /* the basic node */
+       char *name;             /* the dir entry name */
+       char *fullname;         /* the dir entry name */
+       int   allocated;
+       struct stat dstat;      /* the file stat info */
+#ifdef CONFIG_SELINUX
+       security_context_t sid;
+#endif
+       struct dnode *next;     /* point at the next node */
 };
 typedef struct dnode dnode_t;
 
-static struct dnode **list_dir(char *);
+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;
-#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;
-#endif
+static unsigned int all_fmt;
 
-static unsigned short column = 0;
 #ifdef CONFIG_FEATURE_AUTOWIDTH
-static unsigned short terminal_width = TERMINAL_WIDTH;
-static unsigned short column_width = COLUMN_WIDTH;
+static int terminal_width = TERMINAL_WIDTH;
 static unsigned short tabstops = COLUMN_GAP;
 #else
-static unsigned short column_width = COLUMN_WIDTH;
+#define tabstops COLUMN_GAP
+#define terminal_width TERMINAL_WIDTH
 #endif
 
 static int status = EXIT_SUCCESS;
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-static unsigned long ls_disp_hr = 0;
+static struct dnode *my_stat(char *fullname, char *name)
+{
+       struct stat dstat;
+       struct dnode *cur;
+#ifdef CONFIG_SELINUX
+       security_context_t sid=NULL;
 #endif
 
-static int my_stat(struct dnode *cur)
-{
 #ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-       if (follow_links) {
-               if (stat(cur->fullname, &cur->dstat)) {
-                       perror_msg("%s", cur->fullname);
+       if (all_fmt & FOLLOW_LINKS) {
+#ifdef CONFIG_SELINUX
+               if (is_selinux_enabled())  {
+                        getfilecon(fullname,&sid);
+               }
+#endif
+               if (stat(fullname, &dstat)) {
+                       bb_perror_msg("%s", fullname);
                        status = EXIT_FAILURE;
-                       free(cur->fullname);
-                       free(cur);
-                       return -1;
+                       return 0;
                }
        } else
 #endif
-       if (lstat(cur->fullname, &cur->dstat)) {
-               perror_msg("%s", cur->fullname);
-               status = EXIT_FAILURE;
-               free(cur->fullname);
-               free(cur);
-               return -1;
+       {
+#ifdef CONFIG_SELINUX
+               if  (is_selinux_enabled()) {
+                 lgetfilecon(fullname,&sid);
+               }
+#endif
+               if (lstat(fullname, &dstat)) {
+                       bb_perror_msg("%s", fullname);
+                       status = EXIT_FAILURE;
+                       return 0;
+               }
        }
-       return 0;
-}
 
-static void newline(void)
-{
-    if (column > 0) {
-        putchar('\n');
-        column = 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;
 }
 
 /*----------------------------------------------------------------------*/
@@ -234,12 +222,10 @@ static void newline(void)
 static char fgcolor(mode_t mode)
 {
        /* Check wheter the file is existing (if so, color it red!) */
-       if ( errno == ENOENT ) {
-               errno = 0;
-           return '\037';
+       if (errno == ENOENT) {
+               return '\037';
        }
-       if ( LIST_EXEC && S_ISREG( mode )
-           && ( mode & ( S_IXUSR | S_IXGRP | S_IXOTH ) ) ) 
+       if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
                return COLOR(0xF000);   /* File is executable ... */
        return COLOR(mode);
 }
@@ -247,71 +233,49 @@ static char fgcolor(mode_t mode)
 /*----------------------------------------------------------------------*/
 static char bgcolor(mode_t mode)
 {
-       if ( LIST_EXEC && S_ISREG( mode )
-           && ( mode & ( S_IXUSR | S_IXGRP | S_IXOTH ) ) ) 
+       if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
                return ATTR(0xF000);    /* File is executable ... */
        return ATTR(mode);
 }
 #endif
 
 /*----------------------------------------------------------------------*/
-#ifdef CONFIG_FEATURE_LS_FILETYPES
+#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 (S_ISDIR(mode))
+               return '/';
+       if (!(all_fmt & LIST_EXEC))
                return '\0';
-       if ((list_fmt & LIST_EXEC) && S_ISREG(mode)
-           && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*';
-               return APPCHAR(mode);
+       if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+               return '*';
+       return APPCHAR(mode);
 }
 #endif
 
 /*----------------------------------------------------------------------*/
-static void nexttabstop( void )
-{
-       static short nexttab= 0;
-       int n=0;
-
-       if (column > 0) {
-               n= nexttab - column;
-               if (n < 1) n= 1;
-               while (n--) {
-                       putchar(' ');
-                       column++;
-               }
-       }
-       nexttab= column + column_width + COLUMN_GAP; 
-}
 
-/*----------------------------------------------------------------------*/
-static int is_subdir(struct dnode *dn)
-{
-       return (S_ISDIR(dn->dstat.st_mode) && strcmp(dn->name, ".") != 0 &&
-                       strcmp(dn->name, "..") != 0);
-}
+#define countdirs(A,B) count_dirs((A), (B), 1)
+#define countsubdirs(A,B) count_dirs((A), (B), 0)
 
-static int countdirs(struct dnode **dn, int nfiles)
+static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs)
 {
        int i, dirs;
 
-       if (dn==NULL || nfiles < 1) return(0);
-       dirs= 0;
-       for (i=0; i<nfiles; i++) {
-               if (S_ISDIR(dn[i]->dstat.st_mode)) dirs++;
+       if (dn == NULL || nfiles < 1)
+               return (0);
+       dirs = 0;
+       for (i = 0; i < nfiles; i++) {
+               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;
+       return (dirs);
 }
 
 static int countfiles(struct dnode **dnp)
@@ -319,11 +283,13 @@ static int countfiles(struct dnode **dnp)
        int nfiles;
        struct dnode *cur;
 
-       if (dnp == NULL) return(0);
-       nfiles= 0;
-       for (cur= dnp[0];  cur->next != NULL ; cur= cur->next) nfiles++;
+       if (dnp == NULL)
+               return (0);
+       nfiles = 0;
+       for (cur = dnp[0]; cur->next != NULL; cur = cur->next)
+               nfiles++;
        nfiles++;
-       return(nfiles);
+       return (nfiles);
 }
 
 /* get memory to hold an array of pointers */
@@ -331,28 +297,31 @@ static struct dnode **dnalloc(int num)
 {
        struct dnode **p;
 
-       if (num < 1) return(NULL);
+       if (num < 1)
+               return (NULL);
 
-       p= (struct dnode **)xcalloc((size_t)num, (size_t)(sizeof(struct dnode *)));
-       return(p);
+       p = (struct dnode **) xzalloc(num * sizeof(struct dnode *));
+       return (p);
 }
 
 #ifdef CONFIG_FEATURE_LS_RECURSIVE
-static void dfree(struct dnode **dnp)
+static void dfree(struct dnode **dnp, int nfiles)
 {
-       struct dnode *cur, *next;
+       int i;
 
-       if(dnp == NULL) return;
+       if (dnp == NULL)
+               return;
 
-       cur=dnp[0];
-       while (cur != NULL) {
-               if (cur->fullname != NULL) free(cur->fullname); /* free the filename */
-               next= cur->next;
-               free(cur);                              /* free the dnode */
-               cur= next;
+       for (i = 0; i < nfiles; i++) {
+               struct dnode *cur = dnp[i];
+               if(cur->allocated)
+                       free(cur->fullname);    /* free the filename */
+               free(cur);              /* free the dnode */
        }
-       free(dnp);      /* free the array holding the dnode pointers */
+       free(dnp);                      /* free the array holding the dnode pointers */
 }
+#else
+#define dfree(...)
 #endif
 
 static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
@@ -360,564 +329,682 @@ static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
        int dncnt, i, d;
        struct dnode **dnp;
 
-       if (dn==NULL || nfiles < 1) return(NULL);
+       if (dn == NULL || nfiles < 1)
+               return (NULL);
 
        /* count how many dirs and regular files there are */
        if (which == SPLIT_SUBDIR)
                dncnt = countsubdirs(dn, nfiles);
        else {
-               dncnt= countdirs(dn, nfiles); /* assume we are looking for dirs */
+               dncnt = countdirs(dn, nfiles);  /* assume we are looking for dirs */
                if (which == SPLIT_FILE)
-                       dncnt= nfiles - dncnt;  /* looking for files */
+                       dncnt = nfiles - dncnt; /* looking for files */
        }
 
        /* allocate a file array and a dir array */
-       dnp= dnalloc(dncnt);
+       dnp = dnalloc(dncnt);
 
        /* 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 */
+       for (d = i = 0; i < nfiles; i++) {
+               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);
+       return (dnp);
 }
 
 /*----------------------------------------------------------------------*/
 #ifdef CONFIG_FEATURE_LS_SORTFILES
-static int sortcmp(struct dnode *d1, struct dnode *d2)
+static int sortcmp(const void *a, const void *b)
 {
-       int cmp, dif;
+       struct dnode *d1 = *(struct dnode **)a;
+       struct dnode *d2 = *(struct dnode **)b;
+       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);
-       /* } else if (sort_opts == SORT_VERSION) { */
-       /* } else if (sort_opts == SORT_EXT) { */
-       } else {    /* assume SORT_NAME */
-               dif= 0;
+               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) { */
        }
 
-       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 */
-               dif= strcmp(d1->name, d2->name);
-               if (dif > 0) cmp=  1;
-               if (dif < 0) cmp= -1;
+               if (ENABLE_LOCALE_SUPPORT) dif = strcoll(d1->name, d2->name);
+               else dif = strcmp(d1->name, d2->name);
        }
 
-       if (sort_order == SORT_REVERSE) {
-               cmp=  -1 * cmp;
+       if (all_fmt & SORT_ORDER_REVERSE) {
+               dif = -dif;
        }
-       return(cmp);
+       return (dif);
 }
 
 /*----------------------------------------------------------------------*/
-static void shellsort(struct dnode **dn, int size)
+static void dnsort(struct dnode **dn, int size)
 {
-       struct dnode *temp;
-       int gap, i, j;
-
-       /* shell short the array */
-       if(dn==NULL || size < 2) return;
-
-       for (gap= size/2; gap>0; gap /=2) {
-               for (i=gap; i<size; i++) {
-                       for (j= i-gap; j>=0; j-=gap) {
-                               if (sortcmp(dn[j], dn[j+gap]) <= 0)
-                                       break;
-                               /* they are out of order, swap them */
-                               temp= dn[j];
-                               dn[j]= dn[j+gap];
-                               dn[j+gap]= temp;
-                       }
-               }
-       }
+       qsort(dn, size, sizeof *dn, sortcmp);
 }
+#else
+#define sortcmp(a, b) 0
+#define dnsort(dn, size)
 #endif
 
+
 /*----------------------------------------------------------------------*/
 static void showfiles(struct dnode **dn, int nfiles)
 {
        int i, ncols, nrows, row, nc;
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-       int len;
-#endif
+       int column = 0;
+       int nexttab = 0;
+       int column_width = 0; /* for STYLE_LONG and STYLE_SINGLE not used */
 
-       if(dn==NULL || nfiles < 1) return;
+       if (dn == NULL || nfiles < 1)
+               return;
 
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-       /* find the longest file name-  use that as the column width */
-       column_width= 0;
-       for (i=0; i<nfiles; i++) {
-               len= strlen(dn[i]->name) +
-                       ((list_fmt & LIST_INO) ? 8 : 0) +
-                       ((list_fmt & LIST_BLOCKS) ? 5 : 0)
-                       ;
-               if (column_width < len) 
-                       column_width= len;
-       }
-       ncols = (int)(terminal_width / (column_width + COLUMN_GAP));
-#else
-       ncols= TERMINAL_WIDTH;
-#endif
-       switch (style_fmt) {
-               case STYLE_LONG:        /* one record per line, extended info */
-               case STYLE_SINGLE:      /* one record per line */
-                       ncols= 1;
-                       break;
+       if (all_fmt & STYLE_ONE_RECORD_FLAG) {
+               ncols = 1;
+       } else {
+               /* find the longest file name-  use that as the column width */
+               for (i = 0; i < nfiles; i++) {
+                       int len = strlen(dn[i]->name) +
+#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);
        }
 
        if (ncols > 1) {
                nrows = nfiles / ncols;
+               if ((nrows * ncols) < nfiles)
+                       nrows++;                /* round up fractionals */
        } else {
                nrows = nfiles;
                ncols = 1;
        }
-       if ((nrows * ncols) < nfiles) nrows++; /* round up fractionals */
 
-       if (nrows > nfiles) nrows= nfiles;
-       for (row=0; row<nrows; row++) {
-               for (nc=0; nc<ncols; nc++) {
+       for (row = 0; row < nrows; row++) {
+               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)
-                               i= (row * ncols) + nc;  /* display across row */
+                       i = (nc * nrows) + row; /* assume display by column */
+                       if (all_fmt & DISP_ROWS)
+                               i = (row * ncols) + nc; /* display across row */
                        if (i < nfiles) {
-                               nexttabstop();
-                               list_single(dn[i]);
+                               if (column > 0) {
+                                       nexttab -= column;
+                                       while (nexttab--) {
+                                               putchar(' ');
+                                               column++;
+                                       }
                        }
+                               nexttab = column + column_width;
+                               column += list_single(dn[i]);
                }
-               newline();
+               }
+               putchar('\n');
+               column = 0;
        }
 }
 
 /*----------------------------------------------------------------------*/
-static void showdirs(struct dnode **dn, int ndirs)
+static void showdirs(struct dnode **dn, int ndirs, int first)
 {
        int i, nfiles;
        struct dnode **subdnp;
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
        int dndirs;
        struct dnode **dnd;
-#endif
 
-       if (dn==NULL || ndirs < 1) return;
+       if (dn == NULL || ndirs < 1)
+               return;
 
-       for (i=0; i<ndirs; i++) {
-               if (disp_opts & (DISP_DIRNAME | DISP_RECURSIVE)) {
-                       printf("\n%s:\n", dn[i]->fullname);
+       for (i = 0; i < ndirs; i++) {
+               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);
+               subdnp = list_dir(dn[i]->fullname);
+               nfiles = countfiles(subdnp);
                if (nfiles > 0) {
                        /* list all files at this level */
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                       shellsort(subdnp, nfiles);
-#endif
+                       if (ENABLE_FEATURE_LS_SORTFILES) dnsort(subdnp, nfiles);
                        showfiles(subdnp, nfiles);
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
-                       if (disp_opts & DISP_RECURSIVE) {
-                               /* recursive- list the sub-dirs */
-                               dnd= splitdnarray(subdnp, nfiles, SPLIT_SUBDIR);
-                               dndirs= countsubdirs(subdnp, nfiles);
-                               if (dndirs > 0) {
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                                       shellsort(dnd, dndirs);
-#endif
-                                       showdirs(dnd, dndirs);
-                                       free(dnd);  /* free the array of dnode pointers to the dirs */
+                       if (ENABLE_FEATURE_LS_RECURSIVE) {
+                               if (all_fmt & DISP_RECURSIVE) {
+                                       /* recursive- list the sub-dirs */
+                                       dnd = splitdnarray(subdnp, nfiles, SPLIT_SUBDIR);
+                                       dndirs = countsubdirs(subdnp, nfiles);
+                                       if (dndirs > 0) {
+                                               if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnd, dndirs);
+                                               showdirs(dnd, dndirs, 0);
+                                               /* free the array of dnode pointers to the dirs */
+                                               free(dnd);
+                                       }
                                }
+                               /* free the dnodes and the fullname mem */
+                               dfree(subdnp, nfiles);
                        }
-                       dfree(subdnp);  /* free the dnodes and the fullname mem */
-#endif
                }
        }
 }
 
 /*----------------------------------------------------------------------*/
-static struct dnode **list_dir(char *path)
+static struct dnode **list_dir(const char *path)
 {
        struct dnode *dn, *cur, **dnp;
        struct dirent *entry;
        DIR *dir;
        int i, nfiles;
 
-       if (path==NULL) return(NULL);
+       if (path == NULL)
+               return (NULL);
 
-       dn= NULL;
-       nfiles= 0;
-       dir = opendir(path);
+       dn = NULL;
+       nfiles = 0;
+       dir = warn_opendir(path);
        if (dir == NULL) {
-               perror_msg("%s", path);
                status = EXIT_FAILURE;
-               return(NULL);   /* could not open the dir */
+               return (NULL);  /* could not open the dir */
        }
        while ((entry = readdir(dir)) != NULL) {
+               char *fullname;
+
                /* are we going to list the file- it may be . or .. or a hidden file */
-               if ((strcmp(entry->d_name, ".")==0) && !(disp_opts & DISP_DOT))
+               if (entry->d_name[0] == '.') {
+                       if ((entry->d_name[1] == 0 || (
+                               entry->d_name[1] == '.'
+                               && entry->d_name[2] == 0))
+                                       && !(all_fmt & DISP_DOT))
                        continue;
-               if ((strcmp(entry->d_name, "..")==0) && !(disp_opts & DISP_DOT))
+                       if (!(all_fmt & DISP_HIDDEN))
                        continue;
-               if ((entry->d_name[0] ==  '.') && !(disp_opts & DISP_HIDDEN))
-                       continue;
-               cur= (struct dnode *)xmalloc(sizeof(struct dnode));
-               cur->fullname = concat_path_file(path, entry->d_name);
-               cur->name = cur->fullname +
-                               (strlen(cur->fullname) - strlen(entry->d_name));
-               if (my_stat(cur))
+               }
+               fullname = concat_path_file(path, entry->d_name);
+               cur = my_stat(fullname, strrchr(fullname, '/') + 1);
+               if (!cur)
                        continue;
-               cur->next= dn;
-               dn= cur;
+               cur->allocated = 1;
+               cur->next = dn;
+               dn = cur;
                nfiles++;
        }
        closedir(dir);
 
        /* now that we know how many files there are
-       ** allocate memory for an array to hold dnode pointers
-       */
-       if (nfiles < 1) return(NULL);
-       dnp= dnalloc(nfiles);
-       for (i=0, cur=dn; i<nfiles; i++) {
-               dnp[i]= cur;   /* save pointer to node in array */
-               cur= cur->next;
+          ** allocate memory for an array to hold dnode pointers
+        */
+       if (dn == NULL)
+               return (NULL);
+       dnp = dnalloc(nfiles);
+       for (i = 0, cur = dn; i < nfiles; i++) {
+               dnp[i] = cur;   /* save pointer to node in array */
+               cur = cur->next;
        }
 
-       return(dnp);
+       return (dnp);
 }
 
 /*----------------------------------------------------------------------*/
 static int list_single(struct dnode *dn)
 {
-       int i;
+       int i, column = 0;
+
 #ifdef CONFIG_FEATURE_LS_USERNAME
-       char scratch[BUFSIZ + 1];
+       char scratch[16];
 #endif
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
        char *filetime;
        time_t ttime, age;
 #endif
-#if defined (CONFIG_FEATURE_LS_FILETYPES)
+#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined (CONFIG_FEATURE_LS_COLOR)
        struct stat info;
-#endif
-#ifdef CONFIG_FEATURE_LS_FILETYPES
        char append;
 #endif
 
-       if (dn==NULL || dn->fullname==NULL) return(0);
+       if (dn->fullname == NULL)
+               return (0);
 
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-       ttime= dn->dstat.st_mtime;      /* the default time */
-       if (time_fmt & TIME_ACCESS) ttime= dn->dstat.st_atime;
-       if (time_fmt & TIME_CHANGE) ttime= dn->dstat.st_ctime;
-       filetime= ctime(&ttime);
+       ttime = dn->dstat.st_mtime;     /* the default time */
+       if (all_fmt & TIME_ACCESS)
+               ttime = dn->dstat.st_atime;
+       if (all_fmt & TIME_CHANGE)
+               ttime = dn->dstat.st_ctime;
+       filetime = ctime(&ttime);
 #endif
 #ifdef CONFIG_FEATURE_LS_FILETYPES
        append = append_char(dn->dstat.st_mode);
 #endif
 
-       for (i=0; i<=31; i++) {
-               switch (list_fmt & (1<<i)) {
-                       case LIST_INO:
-                               printf("%7ld ", (long int)dn->dstat.st_ino);
-                               column += 8;
-                               break;
-                       case LIST_BLOCKS:
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-                               fprintf(stdout, "%6s ", make_human_readable_str(dn->dstat.st_blocks>>1, 
-                                                       KILOBYTE, (ls_disp_hr==TRUE)? 0: KILOBYTE));
-#else
+       for (i = 0; i <= 31; i++) {
+               switch (all_fmt & (1 << i)) {
+               case LIST_INO:
+                       column += printf("%7ld ", (long int) dn->dstat.st_ino);
+                       break;
+               case LIST_BLOCKS:
 #if _FILE_OFFSET_BITS == 64
-                               printf("%4lld ", dn->dstat.st_blocks>>1);
+                       column += printf("%4lld ", (long long)dn->dstat.st_blocks >> 1);
 #else
-                               printf("%4ld ", dn->dstat.st_blocks>>1);
-#endif
-#endif
-                               column += 5;
-                               break;
-                       case LIST_MODEBITS:
-                               printf("%-10s ", (char *)mode_string(dn->dstat.st_mode));
-                               column += 10;
-                               break;
-                       case LIST_NLINKS:
-                               printf("%4ld ", (long)dn->dstat.st_nlink);
-                               column += 10;
-                               break;
-                       case LIST_ID_NAME:
+                       column += printf("%4ld ", dn->dstat.st_blocks >> 1);
+#endif
+                       break;
+               case LIST_MODEBITS:
+                       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);
-                               printf("%-8.8s ", scratch);
-                               my_getgrgid(scratch, dn->dstat.st_gid);
-                               printf("%-8.8s", scratch);
-                               column += 17;
-                               break;
-#endif
-                       case LIST_ID_NUMERIC:
-                               printf("%-8d %-8d", dn->dstat.st_uid, dn->dstat.st_gid);
-                               column += 17;
-                               break;
-                       case LIST_SIZE:
-                       case LIST_DEV:
-                               if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) {
-                                       printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev));
-                               } else {
+                       bb_getpwuid(scratch, dn->dstat.st_uid, sizeof(scratch));
+                       printf("%-8.8s ", scratch);
+                       bb_getgrgid(scratch, dn->dstat.st_gid, sizeof(scratch));
+                       printf("%-8.8s", scratch);
+                       column += 17;
+                       break;
+#endif
+               case LIST_ID_NUMERIC:
+                       column += printf("%-8d %-8d", dn->dstat.st_uid, dn->dstat.st_gid);
+                       break;
+               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));
+                       } else {
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-                                       if (ls_disp_hr==TRUE) {
-                                               fprintf(stdout, "%8s ", make_human_readable_str(dn->dstat.st_size, 1, 0));
-                                       } else 
-#endif 
-                                       {
+                               if (all_fmt & LS_DISP_HR) {
+                                       column += printf("%9s ",
+                                                       make_human_readable_str(dn->dstat.st_size, 1, 0));
+                               } else
+#endif
+                               {
 #if _FILE_OFFSET_BITS == 64
-                                               printf("%9lld ", (long long)dn->dstat.st_size);
+                                       column += printf("%9lld ", (long long) dn->dstat.st_size);
 #else
-                                               printf("%9ld ", dn->dstat.st_size);
+                                       column += printf("%9ld ", dn->dstat.st_size);
 #endif
-                                       }
                                }
-                               column += 10;
-                               break;
+                       }
+                       break;
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-                       case LIST_FULLTIME:
-                       case LIST_DATE_TIME:
-                               if (list_fmt & LIST_FULLTIME) {
-                                       printf("%24.24s ", filetime);
-                                       column += 25;
-                                       break;
-                               }
+               case LIST_FULLTIME:
+                       printf("%24.24s ", filetime);
+                       column += 25;
+                       break;
+               case LIST_DATE_TIME:
+                       if ((all_fmt & LIST_FULLTIME) == 0) {
                                age = time(NULL) - ttime;
-                               printf("%6.6s ", filetime+4);
+                               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);
+                                       printf("%5.5s ", filetime + 11);
                                } else {
-                                       printf(" %4.4s ", filetime+20);
+                                       printf(" %4.4s ", filetime + 20);
                                }
                                column += 13;
-                               break;
+                       }
+                       break;
 #endif
-                       case LIST_FILENAME:
-#ifdef CONFIG_FEATURE_LS_COLOR
-                               if (show_color && !lstat(dn->fullname, &info)) {
-                                   printf( "\033[%d;%dm", bgcolor(info.st_mode), 
-                                                               fgcolor(info.st_mode) );
+#ifdef CONFIG_SELINUX
+               case LIST_CONTEXT:
+                       {
+                               char context[80];
+                               int len = 0;
+
+                               if (dn->sid) {
+                                 /*  I assume sid initilized with NULL  */
+                                 len = strlen(dn->sid)+1;
+                                 safe_strncpy(context, dn->sid, len);
+                                 freecon(dn->sid);
+                               }else {
+                                 safe_strncpy(context, "unknown", 8);
                                }
+                               printf("%-32s ", context);
+                               column += MAX(33, len);
+                       }
+                       break;
 #endif
-                               printf("%s", dn->name);
+               case LIST_FILENAME:
 #ifdef CONFIG_FEATURE_LS_COLOR
-                               if (show_color) {
-                                       printf( "\033[0m" );
-                               }
-#endif
-                               column += strlen(dn->name);
-                               break;
-                       case LIST_SYMLINK:
-                               if (S_ISLNK(dn->dstat.st_mode)) {
-                                       char *lpath = xreadlink(dn->fullname);
-                                       if (lpath) {
-                                               printf(" -> ");
-#if defined(BB_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
-                                               if (!stat(dn->fullname, &info)) {
-                                                       append = append_char(info.st_mode);
-                                               }
+                       errno = 0;
+                       if (show_color && !lstat(dn->fullname, &info)) {
+                               printf("\033[%d;%dm", bgcolor(info.st_mode),
+                                          fgcolor(info.st_mode));
+                       }
 #endif
+                       column += printf("%s", dn->name);
 #ifdef CONFIG_FEATURE_LS_COLOR
-                                               if (show_color) {
-                                                       printf( "\033[%d;%dm", bgcolor(info.st_mode), 
-                                                                       fgcolor(info.st_mode) );
-                                               }
+                       if (show_color) {
+                               printf("\033[0m");
+                       }
+#endif
+                       break;
+               case LIST_SYMLINK:
+                       if (S_ISLNK(dn->dstat.st_mode)) {
+                               char *lpath = xreadlink(dn->fullname);
+
+                               if (lpath) {
+                                       printf(" -> ");
+#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined (CONFIG_FEATURE_LS_COLOR)
+                                       if (!stat(dn->fullname, &info)) {
+                                               append = append_char(info.st_mode);
+                                       }
 #endif
-                                               printf("%s", lpath);
 #ifdef CONFIG_FEATURE_LS_COLOR
-                                               if (show_color) {
-                                                       printf( "\033[0m" );
-                                               }
+                                       if (show_color) {
+                                               errno = 0;
+                                               printf("\033[%d;%dm", bgcolor(info.st_mode),
+                                                          fgcolor(info.st_mode));
+                                       }
 #endif
-                                               column += strlen(lpath) + 4;
-                                               free(lpath);
+                                       column += printf("%s", lpath) + 4;
+#ifdef CONFIG_FEATURE_LS_COLOR
+                                       if (show_color) {
+                                               printf("\033[0m");
                                        }
+#endif
+                                       free(lpath);
                                }
-                               break;
+                       }
+                       break;
 #ifdef CONFIG_FEATURE_LS_FILETYPES
-                       case LIST_FILETYPE:
-                               if (append != '\0') {
-                                       printf("%1c", append);
-                                       column++;
-                               }
-                               break;
+               case LIST_FILETYPE:
+                       if (append != '\0') {
+                               printf("%1c", append);
+                               column++;
+                       }
+                       break;
 #endif
                }
        }
 
-       return(0);
+       return column;
 }
 
 /*----------------------------------------------------------------------*/
-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;
+#ifdef CONFIG_FEATURE_LS_FILETYPES
+# define LS_STR_FILETYPES      "Fp"
+#else
+# define LS_STR_FILETYPES      ""
 #endif
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-       time_fmt= TIME_MOD;
+
+#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
+# define LS_STR_FOLLOW_LINKS   "L"
+#else
+# define LS_STR_FOLLOW_LINKS   ""
 #endif
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-       ioctl(fileno(stdout), TIOCGWINSZ, &win);
-       if (win.ws_row > 4)
-               column_width = win.ws_row - 2;
-       if (win.ws_col > 0)
-               terminal_width = win.ws_col - 1;
+
+#ifdef CONFIG_FEATURE_LS_RECURSIVE
+# define LS_STR_RECURSIVE      "R"
+#else
+# define LS_STR_RECURSIVE      ""
 #endif
-       nfiles=0;
 
-#ifdef CONFIG_FEATURE_LS_COLOR
-       if (isatty(fileno(stdout)))
-               show_color = 1;
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+# define LS_STR_HUMAN_READABLE "h"
+#else
+# define LS_STR_HUMAN_READABLE ""
 #endif
 
-       /* process options */
-       while ((opt = getopt(argc, argv, "1AaCdgilnsx"
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-"T:w:"
+#ifdef CONFIG_SELINUX
+# define LS_STR_SELINUX        "K"
+#else
+# define LS_STR_SELINUX        ""
 #endif
-#ifdef CONFIG_FEATURE_LS_FILETYPES
-"Fp"
+
+#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 \
+       USE_FEATURE_LS_SORTFILES("SXrv") \
+       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
+
+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_RECURSIVE
-"R"
+#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+       TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME),       /* c */
+       LIST_FULLTIME,                          /* e */
+       ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME,       /* t */
+       TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME),       /* u */
 #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_LS_RECURSIVE
+       DISP_RECURSIVE,                         /* R */
 #endif
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-"h"
-#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;
+#ifdef CONFIG_FEATURE_AUTOWIDTH
+       0, 0,                    /* T, w - ignored */
 #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;
+       (1U<<31)
+};
+
+
+/*----------------------------------------------------------------------*/
+
+int ls_main(int argc, char **argv)
+{
+       struct dnode **dnd;
+       struct dnode **dnf;
+       struct dnode **dnp;
+       struct dnode *dn;
+       struct dnode *cur;
+       unsigned 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_TIMESTAMPS
-                       case 'e': list_fmt |= LIST_FULLTIME; break;
-                       case 'c':
-                               time_fmt = TIME_CHANGE;
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                               sort_opts= SORT_CTIME;
+#ifdef CONFIG_FEATURE_LS_COLOR
+       char *color_opt;
 #endif
-                               break;
-                       case 'u':
-                               time_fmt = TIME_ACCESS;
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                               sort_opts= SORT_ATIME;
+
+       all_fmt = LIST_SHORT |
+               (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_ORDER_FORWARD));
+
+#ifdef CONFIG_FEATURE_AUTOWIDTH
+       /* Obtain the terminal width.  */
+       get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL);
+       /* Go one less... */
+       terminal_width--;
 #endif
-                               break;
-                       case 't':
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                               sort_opts= SORT_MTIME;
+
+#ifdef CONFIG_FEATURE_LS_COLOR
+       applet_long_options = ls_color_opt;
 #endif
-                               break;
+
+       /* process options */
+#ifdef CONFIG_FEATURE_AUTOWIDTH
+       opt = getopt32(argc, argv, ls_options, &tabstops_str, &terminal_width_str
+#ifdef CONFIG_FEATURE_LS_COLOR
+               , &color_opt
 #endif
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-                       case 'L': follow_links= TRUE; break;
+               );
+       if (tabstops_str) {
+               tabstops = atoi(tabstops_str);
+       }
+       if (terminal_width_str) {
+               terminal_width = atoi(terminal_width_str);
+       }
+#else
+       opt = getopt32(argc, argv, ls_options
+#ifdef CONFIG_FEATURE_LS_COLOR
+               , &color_opt
 #endif
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-                       case 'T': tabstops= atoi(optarg); break;
-                       case 'w': terminal_width= atoi(optarg); break;
+               );
 #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;
+                       }
+                       if (ENABLE_FEATURE_LS_SORTFILES && (flags & SORT_MASK_TRIGGER)) {
+                               all_fmt &= ~SORT_MASK;
+                       }
+                       if (flags & DISP_MASK_TRIGGER) {
+                               all_fmt &= ~DISP_MASK;
+                       }
+                       if (flags & TIME_MASK) {
+                               all_fmt &= ~TIME_MASK;
+                       }
+                       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 */
+#ifdef CONFIG_FEATURE_LS_COLOR
+       {
+               /* find color bit value - last position for short getopt */
+
+#if CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
+               char *p;
+
+               if ((p = getenv ("LS_COLORS")) != NULL &&
+                       (*p == '\0' || (strcmp(p, "none") == 0))) {
+                       ;
+               } else if (isatty(STDOUT_FILENO)) {
+                       show_color = 1;
+               }
 #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((opt & (1 << i))) {  /* next flag after short options */
+                       if (color_opt == NULL || strcmp("always", color_opt) == 0)
+                               show_color = 1;
+                       else if (color_opt != NULL && strcmp("never", color_opt) == 0)
+                               show_color = 0;
+                       else if (color_opt != NULL && strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
+                               show_color = 1;
+               }
+       }
 #endif
-       if (style_fmt != STYLE_LONG)
-                       list_fmt &= ~LIST_ID_NUMERIC;  /* numeric uid only for long list */
+
+       /* sort out which command line options take precedence */
+#ifdef CONFIG_FEATURE_LS_RECURSIVE
+       if (all_fmt & DISP_NOLIST)
+               all_fmt &= ~DISP_RECURSIVE;     /* no recurse if listing only dir */
+#endif
+       if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) {
+               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;
+       }
+       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))
+               all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE);
 
        /*
         * when there are no cmd line args we have to supply a default "." arg.
@@ -926,70 +1013,64 @@ extern int ls_main(int argc, char **argv)
         * just holds the pointers- we don't move the date the pointers
         * point to.
         */
-       ac= argc - optind;   /* how many cmd line args are left */
+       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(".");
-               ac=1;
+               static const char * const dotdir[] = { "." };
+
+               av = (char **) dotdir;
+               ac = 1;
        } else {
-               av= (char **)xcalloc((size_t)ac, (size_t)(sizeof(char *)));
-               for (oi=0 ; oi < ac; oi++) {
-                       av[oi]= argv[optind++];  /* copy pointer to real cmd line arg */
-               }
+               av = argv + optind;
        }
 
        /* 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++) {
-               cur= (struct dnode *)xmalloc(sizeof(struct dnode));
-               cur->fullname= xstrdup(av[oi]);
-               cur->name= cur->fullname;
-               if (my_stat(cur))
+       dn = NULL;
+       for (oi = 0; oi < ac; oi++) {
+               cur = my_stat(av[oi], av[oi]);
+               if (!cur)
                        continue;
-               cur->next= dn;
-               dn= cur;
+               cur->allocated = 0;
+               cur->next = dn;
+               dn = cur;
                nfiles++;
        }
 
        /* now that we know how many files there are
-       ** allocate memory for an array to hold dnode pointers
-       */
-       dnp= dnalloc(nfiles);
-       for (i=0, cur=dn; i<nfiles; i++) {
-               dnp[i]= cur;   /* save pointer to node in array */
-               cur= cur->next;
+          ** allocate memory for an array to hold dnode pointers
+        */
+       dnp = dnalloc(nfiles);
+       for (i = 0, cur = dn; i < nfiles; i++) {
+               dnp[i] = cur;   /* save pointer to node in array */
+               cur = cur->next;
        }
 
-
-       if (disp_opts & DISP_NOLIST) {
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-               shellsort(dnp, nfiles);
-#endif
-               if (nfiles > 0) showfiles(dnp, nfiles);
+       if (all_fmt & DISP_NOLIST) {
+               if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnp, nfiles);
+               if (nfiles > 0)
+                       showfiles(dnp, nfiles);
        } else {
-               dnd= splitdnarray(dnp, nfiles, SPLIT_DIR);
-               dnf= splitdnarray(dnp, nfiles, SPLIT_FILE);
-               dndirs= countdirs(dnp, nfiles);
-               dnfiles= nfiles - dndirs;
+               dnd = splitdnarray(dnp, nfiles, SPLIT_DIR);
+               dnf = splitdnarray(dnp, nfiles, SPLIT_FILE);
+               dndirs = countdirs(dnp, nfiles);
+               dnfiles = nfiles - dndirs;
                if (dnfiles > 0) {
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                       shellsort(dnf, dnfiles);
-#endif
+                       if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnf, dnfiles);
                        showfiles(dnf, dnfiles);
+                       if (ENABLE_FEATURE_CLEAN_UP)
+                               free(dnf);
                }
                if (dndirs > 0) {
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-                       shellsort(dnd, dndirs);
-#endif
-                       showdirs(dnd, dndirs);
+                       if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnd, dndirs);
+                       showdirs(dnd, dndirs, dnfiles == 0);
+                       if (ENABLE_FEATURE_CLEAN_UP)
+                               free(dnd);
                }
        }
-       return(status);
-
-  print_usage_message:
-       show_usage();
+       if (ENABLE_FEATURE_CLEAN_UP)
+               dfree(dnp, nfiles);
+       return (status);
 }