Bump to version 1.22.1
[platform/upstream/busybox.git] / coreutils / ls.c
index eb40724..166473d 100644 (file)
 //usage:       IF_FEATURE_LS_SORTFILES("rSXv")
 //usage:       IF_FEATURE_LS_TIMESTAMPS("ctu")
 //usage:       IF_SELINUX("kKZ") "]"
-//usage:       IF_FEATURE_AUTOWIDTH(" -w WIDTH") " [FILE]..."
+//usage:       IF_FEATURE_AUTOWIDTH(" [-w WIDTH]") " [FILE]..."
 //usage:#define ls_full_usage "\n\n"
 //usage:       "List directory contents\n"
-//usage:     "\nOptions:"
 //usage:     "\n       -1      One column output"
 //usage:     "\n       -a      Include entries which start with ."
 //usage:     "\n       -A      Like -a, but exclude . and .."
 enum {
 TERMINAL_WIDTH  = 80,           /* use 79 if terminal has linefold bug */
 
-SPLIT_DIR       = 1,
 SPLIT_FILE      = 0,
+SPLIT_DIR       = 1,
 SPLIT_SUBDIR    = 2,
 
-/* Bits in all_fmt: */
+/* Bits in G.all_fmt: */
 
 /* 51306 lrwxrwxrwx  1 root     root         2 May 11 01:43 /bin/view -> vi* */
 /* what file information will be listed */
@@ -183,11 +182,10 @@ LIST_LONG       = LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
 /* -Q       GNU option, busybox always supports */
 /* -k       SELinux option, busybox always supports (ignores if !SELinux) */
 /*          Std has -k which means "show sizes in kbytes" */
-/* -FLHRctur Std options, busybox optionally supports */
-/* -p       Std option, busybox optionally supports */
-/*          Not fully compatible - we show not only '/' but other chars too */
+/* -LHRctur Std options, busybox optionally supports */
+/* -Fp      Std options, busybox optionally supports */
 /* -SXvhTw  GNU options, busybox optionally supports */
-/*          -T TABWIDTH is ignored (we don't use tabs on output) */
+/* -T WIDTH Ignored (we don't use tabs on output) */
 /* -KZ      SELinux mandated options, busybox optionally supports */
 /*          (coreutils 8.4 has no -K, remove it?) */
 /* -e       I think we made this one up (looks similar to GNU --full-time) */
@@ -262,7 +260,7 @@ enum {
 
 /* TODO: simple toggles may be stored as OPT_xxx bits instead */
 static const uint32_t opt_flags[] = {
-       STYLE_COLUMNAR,              /* C */
+       STYLE_COLUMNAR,              /* C */
        DISP_HIDDEN | DISP_DOT,      /* a */
        DISP_NOLIST,                 /* d */
        LIST_INO,                    /* i */
@@ -304,25 +302,63 @@ static const uint32_t opt_flags[] = {
 
 
 /*
- * a directory entry and its stat info are stored here
+ * a directory entry and its stat info
  */
 struct dnode {
-       const char *name;       /* the dir entry name */
-       const char *fullname;   /* the dir entry name */
-       struct dnode *next;     /* point at the next node */
-       smallint fname_allocated;
-       struct stat dstat;      /* the file stat info */
+       const char *name;       /* usually basename, but think "ls -l dir/file" */
+       const char *fullname;   /* full name (usable for stat etc) */
+       struct dnode *dn_next;  /* for linked list */
        IF_SELINUX(security_context_t sid;)
+       smallint fname_allocated;
+
+       /* Used to avoid re-doing [l]stat at printout stage
+        * if we already collected needed data in scan stage:
+        */
+       mode_t    dn_mode_lstat;   /* obtained with lstat, or 0 */
+       mode_t    dn_mode_stat;    /* obtained with stat, or 0 */
+
+//     struct stat dstat;
+// struct stat is huge. We don't need it in full.
+// At least we don't need st_dev and st_blksize,
+// but there are invisible fields as well
+// (such as nanosecond-resolution timespamps)
+// and padding, which we also don't want to store.
+// We also can pre-parse dev_t dn_rdev (in glibc, it's huge).
+// On 32-bit uclibc: dnode size went from 112 to 84 bytes.
+//
+       /* Same names as in struct stat, but with dn_ instead of st_ pfx: */
+       mode_t    dn_mode; /* obtained with lstat OR stat, depending on -L etc */
+       off_t     dn_size;
+#if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES
+       time_t    dn_atime;
+       time_t    dn_mtime;
+       time_t    dn_ctime;
+#endif
+       ino_t     dn_ino;
+       blkcnt_t  dn_blocks;
+       nlink_t   dn_nlink;
+       uid_t     dn_uid;
+       gid_t     dn_gid;
+       int       dn_rdev_maj;
+       int       dn_rdev_min;
+//     dev_t     dn_dev;
+//     blksize_t dn_blksize;
 };
 
 struct globals {
 #if ENABLE_FEATURE_LS_COLOR
        smallint show_color;
+# define G_show_color (G.show_color)
+#else
+# define G_show_color 0
 #endif
        smallint exit_code;
        unsigned all_fmt;
 #if ENABLE_FEATURE_AUTOWIDTH
-       unsigned terminal_width; // = TERMINAL_WIDTH;
+       unsigned terminal_width;
+# define G_terminal_width (G.terminal_width)
+#else
+# define G_terminal_width TERMINAL_WIDTH
 #endif
 #if ENABLE_FEATURE_LS_TIMESTAMPS
        /* Do time() just once. Saves one syscall per file for "ls -l" */
@@ -330,66 +366,16 @@ struct globals {
 #endif
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#if ENABLE_FEATURE_LS_COLOR
-# define show_color     (G.show_color    )
-#else
-enum { show_color = 0 };
-#endif
-#define exit_code       (G.exit_code     )
-#define all_fmt         (G.all_fmt       )
-#if ENABLE_FEATURE_AUTOWIDTH
-# define terminal_width (G.terminal_width)
-#else
-enum {
-       terminal_width = TERMINAL_WIDTH,
-};
-#endif
-#define current_time_t (G.current_time_t)
 #define INIT_G() do { \
        /* we have to zero it out because of NOEXEC */ \
        memset(&G, 0, sizeof(G)); \
-       IF_FEATURE_AUTOWIDTH(terminal_width = TERMINAL_WIDTH;) \
-       IF_FEATURE_LS_TIMESTAMPS(time(&current_time_t);) \
+       IF_FEATURE_AUTOWIDTH(G_terminal_width = TERMINAL_WIDTH;) \
+       IF_FEATURE_LS_TIMESTAMPS(time(&G.current_time_t);) \
 } while (0)
 
 
-static struct dnode *my_stat(const char *fullname, const char *name, int force_follow)
-{
-       struct stat dstat;
-       struct dnode *cur;
-       IF_SELINUX(security_context_t sid = NULL;)
+/*** Output code ***/
 
-       if ((option_mask32 & OPT_L) || force_follow) {
-#if ENABLE_SELINUX
-               if (is_selinux_enabled())  {
-                        getfilecon(fullname, &sid);
-               }
-#endif
-               if (stat(fullname, &dstat)) {
-                       bb_simple_perror_msg(fullname);
-                       exit_code = EXIT_FAILURE;
-                       return 0;
-               }
-       } else {
-#if ENABLE_SELINUX
-               if (is_selinux_enabled()) {
-                       lgetfilecon(fullname, &sid);
-               }
-#endif
-               if (lstat(fullname, &dstat)) {
-                       bb_simple_perror_msg(fullname);
-                       exit_code = EXIT_FAILURE;
-                       return 0;
-               }
-       }
-
-       cur = xmalloc(sizeof(*cur));
-       cur->fullname = fullname;
-       cur->name = name;
-       cur->dstat = dstat;
-       IF_SELINUX(cur->sid = sid;)
-       return cur;
-}
 
 /* FYI type values: 1:fifo 2:char 4:dir 6:blk 8:file 10:link 12:socket
  * (various wacky OSes: 13:Sun door 14:BSD whiteout 5:XENIX named file
@@ -437,14 +423,14 @@ static char bold(mode_t mode)
 }
 #endif
 
-#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
+#if ENABLE_FEATURE_LS_FILETYPES
 static char append_char(mode_t mode)
 {
-       if (!(all_fmt & LIST_FILETYPE))
+       if (!(G.all_fmt & LIST_FILETYPE))
                return '\0';
        if (S_ISDIR(mode))
                return '/';
-       if (!(all_fmt & LIST_CLASSIFY))
+       if (!(G.all_fmt & LIST_CLASSIFY))
                return '\0';
        if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
                return '*';
@@ -452,149 +438,6 @@ static char append_char(mode_t mode)
 }
 #endif
 
-static unsigned count_dirs(struct dnode **dn, int which)
-{
-       unsigned dirs, all;
-
-       if (!dn)
-               return 0;
-
-       dirs = all = 0;
-       for (; *dn; dn++) {
-               const char *name;
-
-               all++;
-               if (!S_ISDIR((*dn)->dstat.st_mode))
-                       continue;
-               name = (*dn)->name;
-               if (which != SPLIT_SUBDIR /* if not requested to skip . / .. */
-                /* or if it's not . or .. */
-                || name[0] != '.' || (name[1] && (name[1] != '.' || name[2]))
-               ) {
-                       dirs++;
-               }
-       }
-       return which != SPLIT_FILE ? dirs : all - dirs;
-}
-
-/* get memory to hold an array of pointers */
-static struct dnode **dnalloc(unsigned num)
-{
-       if (num < 1)
-               return NULL;
-
-       num++; /* so that we have terminating NULL */
-       return xzalloc(num * sizeof(struct dnode *));
-}
-
-#if ENABLE_FEATURE_LS_RECURSIVE
-static void dfree(struct dnode **dnp)
-{
-       unsigned i;
-
-       if (dnp == NULL)
-               return;
-
-       for (i = 0; dnp[i]; i++) {
-               struct dnode *cur = dnp[i];
-               if (cur->fname_allocated)
-                       free((char*)cur->fullname);
-               free(cur);
-       }
-       free(dnp);
-}
-#else
-#define dfree(...) ((void)0)
-#endif
-
-/* Returns NULL-terminated malloced vector of pointers (or NULL) */
-static struct dnode **splitdnarray(struct dnode **dn, int which)
-{
-       unsigned dncnt, d;
-       struct dnode **dnp;
-
-       if (dn == NULL)
-               return NULL;
-
-       /* count how many dirs or files there are */
-       dncnt = count_dirs(dn, which);
-
-       /* allocate a file array and a dir array */
-       dnp = dnalloc(dncnt);
-
-       /* copy the entrys into the file or dir array */
-       for (d = 0; *dn; dn++) {
-               if (S_ISDIR((*dn)->dstat.st_mode)) {
-                       const char *name;
-
-                       if (!(which & (SPLIT_DIR|SPLIT_SUBDIR)))
-                               continue;
-                       name = (*dn)->name;
-                       if ((which & SPLIT_DIR)
-                        || name[0]!='.' || (name[1] && (name[1]!='.' || name[2]))
-                       ) {
-                               dnp[d++] = *dn;
-                       }
-               } else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) {
-                       dnp[d++] = *dn;
-               }
-       }
-       return dnp;
-}
-
-#if ENABLE_FEATURE_LS_SORTFILES
-static int sortcmp(const void *a, const void *b)
-{
-       struct dnode *d1 = *(struct dnode **)a;
-       struct dnode *d2 = *(struct dnode **)b;
-       unsigned sort_opts = all_fmt & SORT_MASK;
-       off_t dif;
-
-       dif = 0; /* assume SORT_NAME */
-       // TODO: use pre-initialized function pointer
-       // instead of branch forest
-       if (sort_opts == SORT_SIZE) {
-               dif = (d2->dstat.st_size - d1->dstat.st_size);
-       } else if (sort_opts == SORT_ATIME) {
-               dif = (d2->dstat.st_atime - d1->dstat.st_atime);
-       } else if (sort_opts == SORT_CTIME) {
-               dif = (d2->dstat.st_ctime - d1->dstat.st_ctime);
-       } else if (sort_opts == SORT_MTIME) {
-               dif = (d2->dstat.st_mtime - d1->dstat.st_mtime);
-       } else if (sort_opts == SORT_DIR) {
-               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) {
-               /* sort by name, or tie_breaker for other sorts */
-               if (ENABLE_LOCALE_SUPPORT)
-                       dif = strcoll(d1->name, d2->name);
-               else
-                       dif = strcmp(d1->name, d2->name);
-       }
-
-       /* Make dif fit into an int */
-       if (sizeof(dif) > sizeof(int)) {
-               enum { BITS_TO_SHIFT = 8 * (sizeof(dif) - sizeof(int)) };
-               /* shift leaving only "int" worth of bits */
-               if (dif != 0) {
-                       dif = 1 | (int)((uoff_t)dif >> BITS_TO_SHIFT);
-               }
-       }
-
-       return (all_fmt & SORT_REVERSE) ? -(int)dif : (int)dif;
-}
-
-static void dnsort(struct dnode **dn, int size)
-{
-       qsort(dn, size, sizeof(*dn), sortcmp);
-}
-#else
-#define dnsort(dn, size) ((void)0)
-#endif
-
-
 static unsigned calc_name_len(const char *name)
 {
        unsigned len;
@@ -617,7 +460,6 @@ static unsigned calc_name_len(const char *name)
        return len;
 }
 
-
 /* Return the number of used columns.
  * Note that only STYLE_COLUMNAR uses return value.
  * STYLE_SINGLE and STYLE_LONG don't care.
@@ -656,93 +498,89 @@ static unsigned print_name(const char *name)
  * Note that only STYLE_COLUMNAR uses return value,
  * STYLE_SINGLE and STYLE_LONG don't care.
  */
-static NOINLINE unsigned list_single(const struct dnode *dn)
+static NOINLINE unsigned display_single(const struct dnode *dn)
 {
        unsigned column = 0;
-       char *lpath = lpath; /* for compiler */
+       char *lpath;
 #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
-       struct stat info;
+       struct stat statbuf;
        char append;
 #endif
 
-       /* Never happens:
-       if (dn->fullname == NULL)
-               return 0;
-       */
-
 #if ENABLE_FEATURE_LS_FILETYPES
-       append = append_char(dn->dstat.st_mode);
+       append = append_char(dn->dn_mode);
 #endif
 
        /* Do readlink early, so that if it fails, error message
         * does not appear *inside* the "ls -l" line */
-       if (all_fmt & LIST_SYMLINK)
-               if (S_ISLNK(dn->dstat.st_mode))
+       lpath = NULL;
+       if (G.all_fmt & LIST_SYMLINK)
+               if (S_ISLNK(dn->dn_mode))
                        lpath = xmalloc_readlink_or_warn(dn->fullname);
 
-       if (all_fmt & LIST_INO)
-               column += printf("%7llu ", (long long) dn->dstat.st_ino);
+       if (G.all_fmt & LIST_INO)
+               column += printf("%7llu ", (long long) dn->dn_ino);
 //TODO: -h should affect -s too:
-       if (all_fmt & LIST_BLOCKS)
-               column += printf("%6"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1));
-       if (all_fmt & LIST_MODEBITS)
-               column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode));
-       if (all_fmt & LIST_NLINKS)
-               column += printf("%4lu ", (long) dn->dstat.st_nlink);
-       if (all_fmt & LIST_ID_NUMERIC) {
+       if (G.all_fmt & LIST_BLOCKS)
+               column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
+       if (G.all_fmt & LIST_MODEBITS)
+               column += printf("%-10s ", (char *) bb_mode_string(dn->dn_mode));
+       if (G.all_fmt & LIST_NLINKS)
+               column += printf("%4lu ", (long) dn->dn_nlink);
+       if (G.all_fmt & LIST_ID_NUMERIC) {
                if (option_mask32 & OPT_g)
-                       column += printf("%-8u ", (int) dn->dstat.st_gid);
+                       column += printf("%-8u ", (int) dn->dn_gid);
                else
                        column += printf("%-8u %-8u ",
-                                       (int) dn->dstat.st_uid,
-                                       (int) dn->dstat.st_gid);
+                                       (int) dn->dn_uid,
+                                       (int) dn->dn_gid);
        }
 #if ENABLE_FEATURE_LS_USERNAME
-       else if (all_fmt & LIST_ID_NAME) {
+       else if (G.all_fmt & LIST_ID_NAME) {
                if (option_mask32 & OPT_g) {
                        column += printf("%-8.8s ",
-                               get_cached_groupname(dn->dstat.st_gid));
+                               get_cached_groupname(dn->dn_gid));
                } else {
                        column += printf("%-8.8s %-8.8s ",
-                               get_cached_username(dn->dstat.st_uid),
-                               get_cached_groupname(dn->dstat.st_gid));
+                               get_cached_username(dn->dn_uid),
+                               get_cached_groupname(dn->dn_gid));
                }
        }
 #endif
-       if (all_fmt & LIST_SIZE) {
-               if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) {
+       if (G.all_fmt & LIST_SIZE) {
+               if (S_ISBLK(dn->dn_mode) || S_ISCHR(dn->dn_mode)) {
                        column += printf("%4u, %3u ",
-                                       (int) major(dn->dstat.st_rdev),
-                                       (int) minor(dn->dstat.st_rdev));
+                                       dn->dn_rdev_maj,
+                                       dn->dn_rdev_min);
                } else {
                        if (option_mask32 & OPT_h) {
                                column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
-                                       /* print st_size, show one fractional, use suffixes */
-                                       make_human_readable_str(dn->dstat.st_size, 1, 0)
+                                       /* print size, show one fractional, use suffixes */
+                                       make_human_readable_str(dn->dn_size, 1, 0)
                                );
                        } else {
-                               column += printf("%9"OFF_FMT"u ", (off_t) dn->dstat.st_size);
+                               column += printf("%9"OFF_FMT"u ", dn->dn_size);
                        }
                }
        }
 #if ENABLE_FEATURE_LS_TIMESTAMPS
-       if (all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) {
+       if (G.all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) {
                char *filetime;
-               time_t ttime = dn->dstat.st_mtime;
-               if (all_fmt & TIME_ACCESS)
-                       ttime = dn->dstat.st_atime;
-               if (all_fmt & TIME_CHANGE)
-                       ttime = dn->dstat.st_ctime;
+               time_t ttime = dn->dn_mtime;
+               if (G.all_fmt & TIME_ACCESS)
+                       ttime = dn->dn_atime;
+               if (G.all_fmt & TIME_CHANGE)
+                       ttime = dn->dn_ctime;
                filetime = ctime(&ttime);
                /* filetime's format: "Wed Jun 30 21:49:08 1993\n" */
-               if (all_fmt & LIST_FULLTIME) { /* -e */
+               if (G.all_fmt & LIST_FULLTIME) { /* -e */
                        /* Note: coreutils 8.4 ls --full-time prints:
                         * 2009-07-13 17:49:27.000000000 +0200
                         */
                        column += printf("%.24s ", filetime);
                } else { /* LIST_DATE_TIME */
-                       /* current_time_t ~== time(NULL) */
-                       time_t age = current_time_t - ttime;
+                       /* G.current_time_t ~== time(NULL) */
+                       time_t age = G.current_time_t - ttime;
                        printf("%.6s ", filetime + 4); /* "Jun 30" */
                        if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
                                /* hh:mm if less than 6 months old */
@@ -755,51 +593,52 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
        }
 #endif
 #if ENABLE_SELINUX
-       if (all_fmt & LIST_CONTEXT) {
+       if (G.all_fmt & LIST_CONTEXT) {
                column += printf("%-32s ", dn->sid ? dn->sid : "unknown");
                freecon(dn->sid);
        }
 #endif
 
 #if ENABLE_FEATURE_LS_COLOR
-       if (show_color) {
-               info.st_mode = 0; /* for fgcolor() */
-               lstat(dn->fullname, &info);
-               printf("\033[%u;%um", bold(info.st_mode),
-                       fgcolor(info.st_mode));
+       if (G_show_color) {
+               mode_t mode = dn->dn_mode_lstat;
+               if (!mode)
+                       if (lstat(dn->fullname, &statbuf) == 0)
+                               mode = statbuf.st_mode;
+               printf("\033[%u;%um", bold(mode), fgcolor(mode));
        }
 #endif
        column += print_name(dn->name);
-       if (show_color) {
+       if (G_show_color) {
                printf("\033[0m");
        }
 
-       if (all_fmt & LIST_SYMLINK) {
-               if (S_ISLNK(dn->dstat.st_mode) && lpath) {
-                       printf(" -> ");
+       if (lpath) {
+               printf(" -> ");
 #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
-#if ENABLE_FEATURE_LS_COLOR
-                       info.st_mode = 0; /* for fgcolor() */
-#endif
-                       if (stat(dn->fullname, &info) == 0) {
-                               append = append_char(info.st_mode);
-                       }
-#endif
-#if ENABLE_FEATURE_LS_COLOR
-                       if (show_color) {
-                               printf("\033[%u;%um", bold(info.st_mode),
-                                          fgcolor(info.st_mode));
+               if ((G.all_fmt & LIST_FILETYPE) || G_show_color) {
+                       mode_t mode = dn->dn_mode_stat;
+                       if (!mode)
+                               if (stat(dn->fullname, &statbuf) == 0)
+                                       mode = statbuf.st_mode;
+# if ENABLE_FEATURE_LS_FILETYPES
+                       append = append_char(mode);
+# endif
+# if ENABLE_FEATURE_LS_COLOR
+                       if (G_show_color) {
+                               printf("\033[%u;%um", bold(mode), fgcolor(mode));
                        }
+# endif
+               }
 #endif
-                       column += print_name(lpath) + 4;
-                       if (show_color) {
-                               printf("\033[0m");
-                       }
-                       free(lpath);
+               column += print_name(lpath) + 4;
+               free(lpath);
+               if (G_show_color) {
+                       printf("\033[0m");
                }
        }
 #if ENABLE_FEATURE_LS_FILETYPES
-       if (all_fmt & LIST_FILETYPE) {
+       if (G.all_fmt & LIST_FILETYPE) {
                if (append) {
                        putchar(append);
                        column++;
@@ -810,14 +649,14 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
        return column;
 }
 
-static void showfiles(struct dnode **dn, unsigned nfiles)
+static void display_files(struct dnode **dn, unsigned nfiles)
 {
        unsigned i, ncols, nrows, row, nc;
        unsigned column;
        unsigned nexttab;
        unsigned column_width = 0; /* used only by STYLE_COLUMNAR */
 
-       if (all_fmt & STYLE_LONG) { /* STYLE_LONG or STYLE_SINGLE */
+       if (G.all_fmt & STYLE_LONG) { /* STYLE_LONG or STYLE_SINGLE */
                ncols = 1;
        } else {
                /* find the longest file name, use that as the column width */
@@ -827,10 +666,10 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
                                column_width = len;
                }
                column_width += 1 +
-                       IF_SELINUX( ((all_fmt & LIST_CONTEXT) ? 33 : 0) + )
-                               ((all_fmt & LIST_INO) ? 8 : 0) +
-                               ((all_fmt & LIST_BLOCKS) ? 5 : 0);
-               ncols = (int) (terminal_width / column_width);
+                       IF_SELINUX( ((G.all_fmt & LIST_CONTEXT) ? 33 : 0) + )
+                               ((G.all_fmt & LIST_INO) ? 8 : 0) +
+                               ((G.all_fmt & LIST_BLOCKS) ? 5 : 0);
+               ncols = (unsigned)G_terminal_width / column_width;
        }
 
        if (ncols > 1) {
@@ -847,7 +686,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
        for (row = 0; row < nrows; row++) {
                for (nc = 0; nc < ncols; nc++) {
                        /* reach into the array based on the column and row */
-                       if (all_fmt & DISP_ROWS)
+                       if (G.all_fmt & DISP_ROWS)
                                i = (row * ncols) + nc; /* display across row */
                        else
                                i = (nc * nrows) + row; /* display by column */
@@ -858,7 +697,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
                                        column += nexttab + 1;
                                }
                                nexttab = column + column_width;
-                               column += list_single(dn[i]);
+                               column += display_single(dn[i]);
                        }
                }
                putchar('\n');
@@ -867,98 +706,241 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
 }
 
 
-#if ENABLE_DESKTOP
-/* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html
- * If any of the -l, -n, -s options is specified, each list
- * of files within the directory shall be preceded by a
- * status line indicating the number of file system blocks
- * occupied by files in the directory in 512-byte units if
- * the -k option is not specified, or 1024-byte units if the
- * -k option is specified, rounded up to the next integral
- * number of units.
- */
-/* by Jorgen Overgaard (jorgen AT antistaten.se) */
-static off_t calculate_blocks(struct dnode **dn)
+/*** Dir scanning code ***/
+
+static struct dnode *my_stat(const char *fullname, const char *name, int force_follow)
 {
-       uoff_t blocks = 1;
-       if (dn) {
-               while (*dn) {
-                       /* st_blocks is in 512 byte blocks */
-                       blocks += (*dn)->dstat.st_blocks;
-                       dn++;
+       struct stat statbuf;
+       struct dnode *cur;
+
+       cur = xzalloc(sizeof(*cur));
+       cur->fullname = fullname;
+       cur->name = name;
+
+       if ((option_mask32 & OPT_L) || force_follow) {
+#if ENABLE_SELINUX
+               if (is_selinux_enabled())  {
+                       getfilecon(fullname, &cur->sid);
+               }
+#endif
+               if (stat(fullname, &statbuf)) {
+                       bb_simple_perror_msg(fullname);
+                       G.exit_code = EXIT_FAILURE;
+                       free(cur);
+                       return NULL;
+               }
+               cur->dn_mode_stat = statbuf.st_mode;
+       } else {
+#if ENABLE_SELINUX
+               if (is_selinux_enabled()) {
+                       lgetfilecon(fullname, &cur->sid);
+               }
+#endif
+               if (lstat(fullname, &statbuf)) {
+                       bb_simple_perror_msg(fullname);
+                       G.exit_code = EXIT_FAILURE;
+                       free(cur);
+                       return NULL;
                }
+               cur->dn_mode_lstat = statbuf.st_mode;
        }
 
-       /* Even though standard says use 512 byte blocks, coreutils use 1k */
-       /* Actually, we round up by calculating (blocks + 1) / 2,
-        * "+ 1" was done when we initialized blocks to 1 */
-       return blocks >> 1;
-}
+       /* cur->dstat = statbuf: */
+       cur->dn_mode   = statbuf.st_mode  ;
+       cur->dn_size   = statbuf.st_size  ;
+#if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES
+       cur->dn_atime  = statbuf.st_atime ;
+       cur->dn_mtime  = statbuf.st_mtime ;
+       cur->dn_ctime  = statbuf.st_ctime ;
 #endif
+       cur->dn_ino    = statbuf.st_ino   ;
+       cur->dn_blocks = statbuf.st_blocks;
+       cur->dn_nlink  = statbuf.st_nlink ;
+       cur->dn_uid    = statbuf.st_uid   ;
+       cur->dn_gid    = statbuf.st_gid   ;
+       cur->dn_rdev_maj = major(statbuf.st_rdev);
+       cur->dn_rdev_min = minor(statbuf.st_rdev);
 
+       return cur;
+}
 
-static struct dnode **list_dir(const char *, unsigned *);
-
-static void showdirs(struct dnode **dn, int first)
+static unsigned count_dirs(struct dnode **dn, int which)
 {
-       unsigned nfiles;
-       unsigned dndirs;
-       struct dnode **subdnp;
-       struct dnode **dnd;
+       unsigned dirs, all;
 
+       if (!dn)
+               return 0;
+
+       dirs = all = 0;
        for (; *dn; dn++) {
-               if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
-                       if (!first)
-                               bb_putchar('\n');
-                       first = 0;
-                       printf("%s:\n", (*dn)->fullname);
+               const char *name;
+
+               all++;
+               if (!S_ISDIR((*dn)->dn_mode))
+                       continue;
+
+               name = (*dn)->name;
+               if (which != SPLIT_SUBDIR /* if not requested to skip . / .. */
+                /* or if it's not . or .. */
+                || name[0] != '.'
+                || (name[1] && (name[1] != '.' || name[2]))
+               ) {
+                       dirs++;
                }
-               subdnp = list_dir((*dn)->fullname, &nfiles);
-#if ENABLE_DESKTOP
-               if ((all_fmt & STYLE_MASK) == STYLE_LONG)
-                       printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
+       }
+       return which != SPLIT_FILE ? dirs : all - dirs;
+}
+
+/* get memory to hold an array of pointers */
+static struct dnode **dnalloc(unsigned num)
+{
+       if (num < 1)
+               return NULL;
+
+       num++; /* so that we have terminating NULL */
+       return xzalloc(num * sizeof(struct dnode *));
+}
+
+#if ENABLE_FEATURE_LS_RECURSIVE
+static void dfree(struct dnode **dnp)
+{
+       unsigned i;
+
+       if (dnp == NULL)
+               return;
+
+       for (i = 0; dnp[i]; i++) {
+               struct dnode *cur = dnp[i];
+               if (cur->fname_allocated)
+                       free((char*)cur->fullname);
+               free(cur);
+       }
+       free(dnp);
+}
+#else
+#define dfree(...) ((void)0)
 #endif
-               if (nfiles > 0) {
-                       /* list all files at this level */
-                       dnsort(subdnp, nfiles);
-                       showfiles(subdnp, nfiles);
-                       if (ENABLE_FEATURE_LS_RECURSIVE
-                        && (all_fmt & DISP_RECURSIVE)
+
+/* Returns NULL-terminated malloced vector of pointers (or NULL) */
+static struct dnode **splitdnarray(struct dnode **dn, int which)
+{
+       unsigned dncnt, d;
+       struct dnode **dnp;
+
+       if (dn == NULL)
+               return NULL;
+
+       /* count how many dirs or files there are */
+       dncnt = count_dirs(dn, which);
+
+       /* allocate a file array and a dir array */
+       dnp = dnalloc(dncnt);
+
+       /* copy the entrys into the file or dir array */
+       for (d = 0; *dn; dn++) {
+               if (S_ISDIR((*dn)->dn_mode)) {
+                       const char *name;
+
+                       if (which == SPLIT_FILE)
+                               continue;
+
+                       name = (*dn)->name;
+                       if ((which & SPLIT_DIR) /* any dir... */
+                       /* ... or not . or .. */
+                        || name[0] != '.'
+                        || (name[1] && (name[1] != '.' || name[2]))
                        ) {
-                               /* recursive - list the sub-dirs */
-                               dnd = splitdnarray(subdnp, SPLIT_SUBDIR);
-                               dndirs = count_dirs(subdnp, SPLIT_SUBDIR);
-                               if (dndirs > 0) {
-                                       dnsort(dnd, dndirs);
-                                       showdirs(dnd, 0);
-                                       /* free the array of dnode pointers to the dirs */
-                                       free(dnd);
-                               }
+                               dnp[d++] = *dn;
                        }
-                       /* free the dnodes and the fullname mem */
-                       dfree(subdnp);
+               } else
+               if (which == SPLIT_FILE) {
+                       dnp[d++] = *dn;
                }
        }
+       return dnp;
 }
 
+#if ENABLE_FEATURE_LS_SORTFILES
+static int sortcmp(const void *a, const void *b)
+{
+       struct dnode *d1 = *(struct dnode **)a;
+       struct dnode *d2 = *(struct dnode **)b;
+       unsigned sort_opts = G.all_fmt & SORT_MASK;
+       off_t dif;
+
+       dif = 0; /* assume SORT_NAME */
+       // TODO: use pre-initialized function pointer
+       // instead of branch forest
+       if (sort_opts == SORT_SIZE) {
+               dif = (d2->dn_size - d1->dn_size);
+       } else
+       if (sort_opts == SORT_ATIME) {
+               dif = (d2->dn_atime - d1->dn_atime);
+       } else
+       if (sort_opts == SORT_CTIME) {
+               dif = (d2->dn_ctime - d1->dn_ctime);
+       } else
+       if (sort_opts == SORT_MTIME) {
+               dif = (d2->dn_mtime - d1->dn_mtime);
+       } else
+       if (sort_opts == SORT_DIR) {
+               dif = S_ISDIR(d2->dn_mode) - S_ISDIR(d1->dn_mode);
+       } else
+#if defined(HAVE_STRVERSCMP) && HAVE_STRVERSCMP == 1
+       if (sort_opts == SORT_VERSION) {
+               dif = strverscmp(d1->name, d2->name);
+       } else
+#endif
+       if (sort_opts == SORT_EXT) {
+               dif = strcmp(strchrnul(d1->name, '.'), strchrnul(d2->name, '.'));
+       }
+       if (dif == 0) {
+               /* sort by name, use as tie breaker for other sorts */
+               if (ENABLE_LOCALE_SUPPORT)
+                       dif = strcoll(d1->name, d2->name);
+               else
+                       dif = strcmp(d1->name, d2->name);
+       }
+
+       /* Make dif fit into an int */
+       if (sizeof(dif) > sizeof(int)) {
+               enum { BITS_TO_SHIFT = 8 * (sizeof(dif) - sizeof(int)) };
+               /* shift leaving only "int" worth of bits */
+               if (dif != 0) {
+                       dif = 1 | (int)((uoff_t)dif >> BITS_TO_SHIFT);
+               }
+       }
+
+       return (G.all_fmt & SORT_REVERSE) ? -(int)dif : (int)dif;
+}
+
+static void dnsort(struct dnode **dn, int size)
+{
+       qsort(dn, size, sizeof(*dn), sortcmp);
+}
+
+static void sort_and_display_files(struct dnode **dn, unsigned nfiles)
+{
+       dnsort(dn, nfiles);
+       display_files(dn, nfiles);
+}
+#else
+# define dnsort(dn, size) ((void)0)
+# define sort_and_display_files(dn, nfiles) display_files(dn, nfiles)
+#endif
 
 /* Returns NULL-terminated malloced vector of pointers (or NULL) */
-static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
+static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
 {
        struct dnode *dn, *cur, **dnp;
        struct dirent *entry;
        DIR *dir;
        unsigned i, nfiles;
 
-       /* Never happens:
-       if (path == NULL)
-               return NULL;
-       */
-
        *nfiles_p = 0;
        dir = warn_opendir(path);
        if (dir == NULL) {
-               exit_code = EXIT_FAILURE;
+               G.exit_code = EXIT_FAILURE;
                return NULL;    /* could not open the dir */
        }
        dn = NULL;
@@ -969,11 +951,11 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
                /* are we going to list the file- it may be . or .. or a hidden file */
                if (entry->d_name[0] == '.') {
                        if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2]))
-                        && !(all_fmt & DISP_DOT)
+                        && !(G.all_fmt & DISP_DOT)
                        ) {
                                continue;
                        }
-                       if (!(all_fmt & DISP_HIDDEN))
+                       if (!(G.all_fmt & DISP_HIDDEN))
                                continue;
                }
                fullname = concat_path_file(path, entry->d_name);
@@ -983,7 +965,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
                        continue;
                }
                cur->fname_allocated = 1;
-               cur->next = dn;
+               cur->dn_next = dn;
                dn = cur;
                nfiles++;
        }
@@ -999,7 +981,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
        dnp = dnalloc(nfiles);
        for (i = 0; /* i < nfiles - detected via !dn below */; i++) {
                dnp[i] = dn;    /* save pointer to node in array */
-               dn = dn->next;
+               dn = dn->dn_next;
                if (!dn)
                        break;
        }
@@ -1007,6 +989,77 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
        return dnp;
 }
 
+#if ENABLE_DESKTOP
+/* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html
+ * If any of the -l, -n, -s options is specified, each list
+ * of files within the directory shall be preceded by a
+ * status line indicating the number of file system blocks
+ * occupied by files in the directory in 512-byte units if
+ * the -k option is not specified, or 1024-byte units if the
+ * -k option is specified, rounded up to the next integral
+ * number of units.
+ */
+/* by Jorgen Overgaard (jorgen AT antistaten.se) */
+static off_t calculate_blocks(struct dnode **dn)
+{
+       uoff_t blocks = 1;
+       if (dn) {
+               while (*dn) {
+                       /* st_blocks is in 512 byte blocks */
+                       blocks += (*dn)->dn_blocks;
+                       dn++;
+               }
+       }
+
+       /* Even though standard says use 512 byte blocks, coreutils use 1k */
+       /* Actually, we round up by calculating (blocks + 1) / 2,
+        * "+ 1" was done when we initialized blocks to 1 */
+       return blocks >> 1;
+}
+#endif
+
+static void scan_and_display_dirs_recur(struct dnode **dn, int first)
+{
+       unsigned nfiles;
+       struct dnode **subdnp;
+
+       for (; *dn; dn++) {
+               if (G.all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
+                       if (!first)
+                               bb_putchar('\n');
+                       first = 0;
+                       printf("%s:\n", (*dn)->fullname);
+               }
+               subdnp = scan_one_dir((*dn)->fullname, &nfiles);
+#if ENABLE_DESKTOP
+               if ((G.all_fmt & STYLE_MASK) == STYLE_LONG)
+                       printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
+#endif
+               if (nfiles > 0) {
+                       /* list all files at this level */
+                       sort_and_display_files(subdnp, nfiles);
+
+                       if (ENABLE_FEATURE_LS_RECURSIVE
+                        && (G.all_fmt & DISP_RECURSIVE)
+                       ) {
+                               struct dnode **dnd;
+                               unsigned dndirs;
+                               /* recursive - list the sub-dirs */
+                               dnd = splitdnarray(subdnp, SPLIT_SUBDIR);
+                               dndirs = count_dirs(subdnp, SPLIT_SUBDIR);
+                               if (dndirs > 0) {
+                                       dnsort(dnd, dndirs);
+                                       scan_and_display_dirs_recur(dnd, 0);
+                                       /* free the array of dnode pointers to the dirs */
+                                       free(dnd);
+                               }
+                       }
+                       /* free the dnodes and the fullname mem */
+                       dfree(subdnp);
+               }
+       }
+}
+
 
 int ls_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -1045,20 +1098,20 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
        init_unicode();
 
        if (ENABLE_FEATURE_LS_SORTFILES)
-               all_fmt = SORT_NAME;
+               G.all_fmt = SORT_NAME;
 
 #if ENABLE_FEATURE_AUTOWIDTH
        /* obtain the terminal width */
-       get_terminal_width_height(STDIN_FILENO, &terminal_width, NULL);
+       get_terminal_width_height(STDIN_FILENO, &G_terminal_width, NULL);
        /* go one less... */
-       terminal_width--;
+       G_terminal_width--;
 #endif
 
        /* process options */
        IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
        opt_complementary =
                /* -e implies -l */
-               "el"
+               IF_FEATURE_LS_TIMESTAMPS("el")
                /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html:
                 * in some pairs of opts, only last one takes effect:
                 */
@@ -1068,11 +1121,11 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */
                ":C-1:1-C" /* bycols/oneline */
                ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */
-               ":c-u:u-c" /* mtime/atime */
+               IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */
                /* -w NUM: */
                IF_FEATURE_AUTOWIDTH(":w+");
        opt = getopt32(argv, ls_options
-               IF_FEATURE_AUTOWIDTH(, NULL, &terminal_width)
+               IF_FEATURE_AUTOWIDTH(, NULL, &G_terminal_width)
                IF_FEATURE_LS_COLOR(, &color_opt)
        );
        for (i = 0; opt_flags[i] != (1U << 31); i++) {
@@ -1080,27 +1133,27 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                        uint32_t flags = opt_flags[i];
 
                        if (flags & STYLE_MASK)
-                               all_fmt &= ~STYLE_MASK;
+                               G.all_fmt &= ~STYLE_MASK;
                        if (flags & SORT_MASK)
-                               all_fmt &= ~SORT_MASK;
+                               G.all_fmt &= ~SORT_MASK;
                        if (flags & TIME_MASK)
-                               all_fmt &= ~TIME_MASK;
+                               G.all_fmt &= ~TIME_MASK;
 
-                       all_fmt |= flags;
+                       G.all_fmt |= flags;
                }
        }
 
 #if ENABLE_FEATURE_LS_COLOR
-       /* set show_color = 1/0 */
+       /* set G_show_color = 1/0 */
        if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) {
                char *p = getenv("LS_COLORS");
                /* LS_COLORS is unset, or (not empty && not "none") ? */
                if (!p || (p[0] && strcmp(p, "none") != 0))
-                       show_color = 1;
+                       G_show_color = 1;
        }
        if (opt & OPT_color) {
                if (color_opt[0] == 'n')
-                       show_color = 0;
+                       G_show_color = 0;
                else switch (index_in_substrings(color_str, color_opt)) {
                case 3:
                case 4:
@@ -1109,34 +1162,34 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                case 0:
                case 1:
                case 2:
-                               show_color = 1;
+                               G_show_color = 1;
                        }
                }
        }
 #endif
 
        /* sort out which command line options take precedence */
-       if (ENABLE_FEATURE_LS_RECURSIVE && (all_fmt & DISP_NOLIST))
-               all_fmt &= ~DISP_RECURSIVE;     /* no recurse if listing only dir */
+       if (ENABLE_FEATURE_LS_RECURSIVE && (G.all_fmt & DISP_NOLIST))
+               G.all_fmt &= ~DISP_RECURSIVE;   /* no recurse if listing only dir */
        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 (G.all_fmt & TIME_CHANGE)
+                       G.all_fmt = (G.all_fmt & ~SORT_MASK) | SORT_CTIME;
+               if (G.all_fmt & TIME_ACCESS)
+                       G.all_fmt = (G.all_fmt & ~SORT_MASK) | SORT_ATIME;
        }
-       if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* not -l? */
-               all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME);
+       if ((G.all_fmt & STYLE_MASK) != STYLE_LONG) /* not -l? */
+               G.all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME);
 
        /* choose a display format if one was not already specified by an option */
-       if (!(all_fmt & STYLE_MASK))
-               all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNAR : STYLE_SINGLE);
+       if (!(G.all_fmt & STYLE_MASK))
+               G.all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNAR : STYLE_SINGLE);
 
        argv += optind;
        if (!argv[0])
                *--argv = (char*)".";
 
        if (argv[1])
-               all_fmt |= DISP_DIRNAME; /* 2 or more items? label directories */
+               G.all_fmt |= DISP_DIRNAME; /* 2 or more items? label directories */
 
        /* stuff the command line file names into a dnode array */
        dn = NULL;
@@ -1144,25 +1197,26 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
        do {
                cur = my_stat(*argv, *argv,
                        /* follow links on command line unless -l, -s or -F: */
-                       !((all_fmt & STYLE_MASK) == STYLE_LONG
-                         || (all_fmt & LIST_BLOCKS)
+                       !((G.all_fmt & STYLE_MASK) == STYLE_LONG
+                         || (G.all_fmt & LIST_BLOCKS)
                          || (option_mask32 & OPT_F)
                        )
                        /* ... or if -H: */
                        || (option_mask32 & OPT_H)
+                       /* ... or if -L, but my_stat always follows links if -L */
                );
                argv++;
                if (!cur)
                        continue;
-               cur->fname_allocated = 0;
-               cur->next = dn;
+               /*cur->fname_allocated = 0; - already is */
+               cur->dn_next = dn;
                dn = cur;
                nfiles++;
        } while (*argv);
 
        /* nfiles _may_ be 0 here - try "ls doesnt_exist" */
        if (nfiles == 0)
-               return exit_code;
+               return G.exit_code;
 
        /* now that we know how many files there are
         * allocate memory for an array to hold dnode pointers
@@ -1170,33 +1224,32 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
        dnp = dnalloc(nfiles);
        for (i = 0; /* i < nfiles - detected via !dn below */; i++) {
                dnp[i] = dn;    /* save pointer to node in array */
-               dn = dn->next;
+               dn = dn->dn_next;
                if (!dn)
                        break;
        }
 
-       if (all_fmt & DISP_NOLIST) {
-               dnsort(dnp, nfiles);
-               showfiles(dnp, nfiles);
+       if (G.all_fmt & DISP_NOLIST) {
+               sort_and_display_files(dnp, nfiles);
        } else {
                dnd = splitdnarray(dnp, SPLIT_DIR);
                dnf = splitdnarray(dnp, SPLIT_FILE);
                dndirs = count_dirs(dnp, SPLIT_DIR);
                dnfiles = nfiles - dndirs;
                if (dnfiles > 0) {
-                       dnsort(dnf, dnfiles);
-                       showfiles(dnf, dnfiles);
+                       sort_and_display_files(dnf, dnfiles);
                        if (ENABLE_FEATURE_CLEAN_UP)
                                free(dnf);
                }
                if (dndirs > 0) {
                        dnsort(dnd, dndirs);
-                       showdirs(dnd, dnfiles == 0);
+                       scan_and_display_dirs_recur(dnd, dnfiles == 0);
                        if (ENABLE_FEATURE_CLEAN_UP)
                                free(dnd);
                }
        }
+
        if (ENABLE_FEATURE_CLEAN_UP)
                dfree(dnp);
-       return exit_code;
+       return G.exit_code;
 }