emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls: reduce memory consumption and speed up (don't do redundant [l]stat)

Browse Source 
function                                             old     new   delta
my_stat                                              110     278    +168
splitdnarray                                         120     118      -2
ls_main                                              769     765      -4
list_single                                          961     931     -30
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 168/-36)           Total: 132 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-05-13 17:28:09 +02:00
parent 66ca241dca
commit 2a81639534
1 changed files with 210 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

368
coreutils/ls.c
View File

@ -118,11 +118,11 @@
enum { enum {
TERMINAL_WIDTH = 80, /* use 79 if terminal has linefold bug */ TERMINAL_WIDTH = 80, /* use 79 if terminal has linefold bug */
SPLIT_DIR = 1,
SPLIT_FILE = 0, SPLIT_FILE = 0,
SPLIT_DIR = 1,
SPLIT_SUBDIR = 2, 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* */ /* 51306 lrwxrwxrwx 1 root root 2 May 11 01:43 /bin/view -> vi* */
/* what file information will be listed */ /* what file information will be listed */
@ -304,25 +304,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 { struct dnode {
const char *name; /* the dir entry name */ const char *name; /* usually basename, but think "ls -l dir/file" */
const char *fullname; /* the dir entry name */ const char *fullname; /* full name (usable for stat etc) */
struct dnode *next; /* point at the next node */ struct dnode *dn_next; /* for linked list */
smallint fname_allocated;
struct stat dstat; /* the file stat info */
IF_SELINUX(security_context_t sid;) 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 { struct globals {
#if ENABLE_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
smallint show_color; smallint show_color;
# define G_show_color (G.show_color)
#else
# define G_show_color 0
#endif #endif
smallint exit_code; smallint exit_code;
unsigned all_fmt; unsigned all_fmt;
#if ENABLE_FEATURE_AUTOWIDTH #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 #endif
#if ENABLE_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
/* Do time() just once. Saves one syscall per file for "ls -l" */ /* Do time() just once. Saves one syscall per file for "ls -l" */
@ -330,64 +368,67 @@ struct globals {
#endif #endif
} FIX_ALIASING; } FIX_ALIASING;
#define G (*(struct globals*)&bb_common_bufsiz1) #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 { \ #define INIT_G() do { \
/* we have to zero it out because of NOEXEC */ \ /* we have to zero it out because of NOEXEC */ \
memset(&G, 0, sizeof(G)); \ memset(&G, 0, sizeof(G)); \
IF_FEATURE_AUTOWIDTH(terminal_width = TERMINAL_WIDTH;) \ IF_FEATURE_AUTOWIDTH(G_terminal_width = TERMINAL_WIDTH;) \
IF_FEATURE_LS_TIMESTAMPS(time(&current_time_t);) \ IF_FEATURE_LS_TIMESTAMPS(time(&G.current_time_t);) \
} while (0) } while (0)
static struct dnode *my_stat(const char *fullname, const char *name, int force_follow) static struct dnode *my_stat(const char *fullname, const char *name, int force_follow)
{ {
struct stat dstat; struct stat statbuf;
struct dnode *cur; struct dnode *cur;
IF_SELINUX(security_context_t sid = NULL;)
cur = xzalloc(sizeof(*cur));
cur->fullname = fullname;
cur->name = name;
if ((option_mask32 & OPT_L) || force_follow) { if ((option_mask32 & OPT_L) || force_follow) {
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (is_selinux_enabled()) { if (is_selinux_enabled()) {
getfilecon(fullname, &sid); getfilecon(fullname, &cur->sid);
} }
#endif #endif
if (stat(fullname, &dstat)) { if (stat(fullname, &statbuf)) {
bb_simple_perror_msg(fullname); bb_simple_perror_msg(fullname);
exit_code = EXIT_FAILURE; G.exit_code = EXIT_FAILURE;
return 0; free(cur);
return NULL;
} }
cur->dn_mode_stat = statbuf.st_mode;
} else { } else {
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (is_selinux_enabled()) { if (is_selinux_enabled()) {
lgetfilecon(fullname, &sid); lgetfilecon(fullname, &cur->sid);
} }
#endif #endif
if (lstat(fullname, &dstat)) { if (lstat(fullname, &statbuf)) {
bb_simple_perror_msg(fullname); bb_simple_perror_msg(fullname);
exit_code = EXIT_FAILURE; G.exit_code = EXIT_FAILURE;
return 0; free(cur);
return NULL;
} }
cur->dn_mode_lstat = statbuf.st_mode;
} }
cur = xmalloc(sizeof(*cur)); /* cur->dstat = statbuf: */
cur->fullname = fullname; cur->dn_mode = statbuf.st_mode ;
cur->name = name; cur->dn_size = statbuf.st_size ;
cur->dstat = dstat; #if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES
IF_SELINUX(cur->sid = sid;) 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; return cur;
} }
@ -437,14 +478,14 @@ static char bold(mode_t mode)
} }
#endif #endif
#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_FILETYPES
static char append_char(mode_t mode) static char append_char(mode_t mode)
{ {
if (!(all_fmt & LIST_FILETYPE)) if (!(G.all_fmt & LIST_FILETYPE))
return '\0'; return '\0';
if (S_ISDIR(mode)) if (S_ISDIR(mode))
return '/'; return '/';
if (!(all_fmt & LIST_CLASSIFY)) if (!(G.all_fmt & LIST_CLASSIFY))
return '\0'; return '\0';
if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
return '*'; return '*';
@ -464,12 +505,14 @@ static unsigned count_dirs(struct dnode **dn, int which)
const char *name; const char *name;
all++; all++;
if (!S_ISDIR((*dn)->dstat.st_mode)) if (!S_ISDIR((*dn)->dn_mode))
continue; continue;
name = (*dn)->name; name = (*dn)->name;
if (which != SPLIT_SUBDIR /* if not requested to skip . / .. */ if (which != SPLIT_SUBDIR /* if not requested to skip . / .. */
/* or if it's not . or .. */ /* or if it's not . or .. */
|| name[0] != '.' || (name[1] && (name[1] != '.' || name[2])) || name[0] != '.'
|| (name[1] && (name[1] != '.' || name[2]))
) { ) {
dirs++; dirs++;
} }
@ -524,18 +567,22 @@ static struct dnode **splitdnarray(struct dnode **dn, int which)
/* copy the entrys into the file or dir array */ /* copy the entrys into the file or dir array */
for (d = 0; *dn; dn++) { for (d = 0; *dn; dn++) {
if (S_ISDIR((*dn)->dstat.st_mode)) { if (S_ISDIR((*dn)->dn_mode)) {
const char *name; const char *name;
if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) if (which == SPLIT_FILE)
continue; continue;
name = (*dn)->name; name = (*dn)->name;
if ((which & SPLIT_DIR) if ((which & SPLIT_DIR) /* any dir... */
|| name[0]!='.' || (name[1] && (name[1]!='.' || name[2])) /* ... or not . or .. */
|| name[0] != '.'
|| (name[1] && (name[1] != '.' || name[2]))
) { ) {
dnp[d++] = *dn; dnp[d++] = *dn;
} }
} else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) { } else
if (which == SPLIT_FILE) {
dnp[d++] = *dn; dnp[d++] = *dn;
} }
} }
@ -547,22 +594,22 @@ static int sortcmp(const void *a, const void *b)
{ {
struct dnode *d1 = *(struct dnode **)a; struct dnode *d1 = *(struct dnode **)a;
struct dnode *d2 = *(struct dnode **)b; struct dnode *d2 = *(struct dnode **)b;
unsigned sort_opts = all_fmt & SORT_MASK; unsigned sort_opts = G.all_fmt & SORT_MASK;
off_t dif; off_t dif;
dif = 0; /* assume SORT_NAME */ dif = 0; /* assume SORT_NAME */
// TODO: use pre-initialized function pointer // TODO: use pre-initialized function pointer
// instead of branch forest // instead of branch forest
if (sort_opts == SORT_SIZE) { if (sort_opts == SORT_SIZE) {
dif = (d2->dstat.st_size - d1->dstat.st_size); dif = (d2->dn_size - d1->dn_size);
} else if (sort_opts == SORT_ATIME) { } else if (sort_opts == SORT_ATIME) {
dif = (d2->dstat.st_atime - d1->dstat.st_atime); dif = (d2->dn_atime - d1->dn_atime);
} else if (sort_opts == SORT_CTIME) { } else if (sort_opts == SORT_CTIME) {
dif = (d2->dstat.st_ctime - d1->dstat.st_ctime); dif = (d2->dn_ctime - d1->dn_ctime);
} else if (sort_opts == SORT_MTIME) { } else if (sort_opts == SORT_MTIME) {
dif = (d2->dstat.st_mtime - d1->dstat.st_mtime); dif = (d2->dn_mtime - d1->dn_mtime);
} else if (sort_opts == SORT_DIR) { } else if (sort_opts == SORT_DIR) {
dif = S_ISDIR(d2->dstat.st_mode) - S_ISDIR(d1->dstat.st_mode); dif = S_ISDIR(d2->dn_mode) - S_ISDIR(d1->dn_mode);
/* } else if (sort_opts == SORT_VERSION) { */ /* } else if (sort_opts == SORT_VERSION) { */
/* } else if (sort_opts == SORT_EXT) { */ /* } else if (sort_opts == SORT_EXT) { */
} }
@ -583,7 +630,7 @@ static int sortcmp(const void *a, const void *b)
} }
} }
return (all_fmt & SORT_REVERSE) ? -(int)dif : (int)dif; return (G.all_fmt & SORT_REVERSE) ? -(int)dif : (int)dif;
} }
static void dnsort(struct dnode **dn, int size) static void dnsort(struct dnode **dn, int size)
@ -661,84 +708,84 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
unsigned column = 0; unsigned column = 0;
char *lpath; char *lpath;
#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
struct stat info; struct stat statbuf;
char append; char append;
#endif #endif
#if ENABLE_FEATURE_LS_FILETYPES #if ENABLE_FEATURE_LS_FILETYPES
append = append_char(dn->dstat.st_mode); append = append_char(dn->dn_mode);
#endif #endif
/* Do readlink early, so that if it fails, error message /* Do readlink early, so that if it fails, error message
* does not appear *inside* the "ls -l" line */ * does not appear *inside* the "ls -l" line */
lpath = NULL; lpath = NULL;
if (all_fmt & LIST_SYMLINK) if (G.all_fmt & LIST_SYMLINK)
if (S_ISLNK(dn->dstat.st_mode)) if (S_ISLNK(dn->dn_mode))
lpath = xmalloc_readlink_or_warn(dn->fullname); lpath = xmalloc_readlink_or_warn(dn->fullname);
if (all_fmt & LIST_INO) if (G.all_fmt & LIST_INO)
column += printf("%7llu ", (long long) dn->dstat.st_ino); column += printf("%7llu ", (long long) dn->dn_ino);
//TODO: -h should affect -s too: //TODO: -h should affect -s too:
if (all_fmt & LIST_BLOCKS) if (G.all_fmt & LIST_BLOCKS)
column += printf("%6"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1)); column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
if (all_fmt & LIST_MODEBITS) if (G.all_fmt & LIST_MODEBITS)
column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode)); column += printf("%-10s ", (char *) bb_mode_string(dn->dn_mode));
if (all_fmt & LIST_NLINKS) if (G.all_fmt & LIST_NLINKS)
column += printf("%4lu ", (long) dn->dstat.st_nlink); column += printf("%4lu ", (long) dn->dn_nlink);
if (all_fmt & LIST_ID_NUMERIC) { if (G.all_fmt & LIST_ID_NUMERIC) {
if (option_mask32 & OPT_g) if (option_mask32 & OPT_g)
column += printf("%-8u ", (int) dn->dstat.st_gid); column += printf("%-8u ", (int) dn->dn_gid);
else else
column += printf("%-8u %-8u ", column += printf("%-8u %-8u ",
(int) dn->dstat.st_uid, (int) dn->dn_uid,
(int) dn->dstat.st_gid); (int) dn->dn_gid);
} }
#if ENABLE_FEATURE_LS_USERNAME #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) { if (option_mask32 & OPT_g) {
column += printf("%-8.8s ", column += printf("%-8.8s ",
get_cached_groupname(dn->dstat.st_gid)); get_cached_groupname(dn->dn_gid));
} else { } else {
column += printf("%-8.8s %-8.8s ", column += printf("%-8.8s %-8.8s ",
get_cached_username(dn->dstat.st_uid), get_cached_username(dn->dn_uid),
get_cached_groupname(dn->dstat.st_gid)); get_cached_groupname(dn->dn_gid));
} }
} }
#endif #endif
if (all_fmt & LIST_SIZE) { if (G.all_fmt & LIST_SIZE) {
if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) { if (S_ISBLK(dn->dn_mode) || S_ISCHR(dn->dn_mode)) {
column += printf("%4u, %3u ", column += printf("%4u, %3u ",
(int) major(dn->dstat.st_rdev), dn->dn_rdev_maj,
(int) minor(dn->dstat.st_rdev)); dn->dn_rdev_min);
} else { } else {
if (option_mask32 & OPT_h) { if (option_mask32 & OPT_h) {
column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ", column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
/* print st_size, show one fractional, use suffixes */ /* print size, show one fractional, use suffixes */
make_human_readable_str(dn->dstat.st_size, 1, 0) make_human_readable_str(dn->dn_size, 1, 0)
); );
} else { } 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 ENABLE_FEATURE_LS_TIMESTAMPS
if (all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) { if (G.all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) {
char *filetime; char *filetime;
time_t ttime = dn->dstat.st_mtime; time_t ttime = dn->dn_mtime;
if (all_fmt & TIME_ACCESS) if (G.all_fmt & TIME_ACCESS)
ttime = dn->dstat.st_atime; ttime = dn->dn_atime;
if (all_fmt & TIME_CHANGE) if (G.all_fmt & TIME_CHANGE)
ttime = dn->dstat.st_ctime; ttime = dn->dn_ctime;
filetime = ctime(&ttime); filetime = ctime(&ttime);
/* filetime's format: "Wed Jun 30 21:49:08 1993\n" */ /* 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: /* Note: coreutils 8.4 ls --full-time prints:
* 2009-07-13 17:49:27.000000000 +0200 * 2009-07-13 17:49:27.000000000 +0200
*/ */
column += printf("%.24s ", filetime); column += printf("%.24s ", filetime);
} else { /* LIST_DATE_TIME */ } else { /* LIST_DATE_TIME */
/* current_time_t ~== time(NULL) */ /* G.current_time_t ~== time(NULL) */
time_t age = current_time_t - ttime; time_t age = G.current_time_t - ttime;
printf("%.6s ", filetime + 4); /* "Jun 30" */ printf("%.6s ", filetime + 4); /* "Jun 30" */
if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) { if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
/* hh:mm if less than 6 months old */ /* hh:mm if less than 6 months old */
@ -751,48 +798,52 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
} }
#endif #endif
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (all_fmt & LIST_CONTEXT) { if (G.all_fmt & LIST_CONTEXT) {
column += printf("%-32s ", dn->sid ? dn->sid : "unknown"); column += printf("%-32s ", dn->sid ? dn->sid : "unknown");
freecon(dn->sid); freecon(dn->sid);
} }
#endif #endif
#if ENABLE_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
if (show_color) { if (G_show_color) {
info.st_mode = 0; mode_t mode = dn->dn_mode_lstat;
lstat(dn->fullname, &info); if (!mode)
printf("\033[%u;%um", bold(info.st_mode), if (lstat(dn->fullname, &statbuf) == 0)
fgcolor(info.st_mode)); mode = statbuf.st_mode;
printf("\033[%u;%um", bold(mode), fgcolor(mode));
} }
#endif #endif
column += print_name(dn->name); column += print_name(dn->name);
if (show_color) { if (G_show_color) {
printf("\033[0m"); printf("\033[0m");
} }
if (lpath) { if (lpath) {
printf(" -> "); printf(" -> ");
#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
info.st_mode = 0; if ((G.all_fmt & LIST_FILETYPE) || G_show_color) {
stat(dn->fullname, &info); mode_t mode = dn->dn_mode_stat;
if (!mode)
if (stat(dn->fullname, &statbuf) == 0)
mode = statbuf.st_mode;
# if ENABLE_FEATURE_LS_FILETYPES # if ENABLE_FEATURE_LS_FILETYPES
append = append_char(info.st_mode); append = append_char(mode);
# endif
# if ENABLE_FEATURE_LS_COLOR
if (G_show_color) {
printf("\033[%u;%um", bold(mode), fgcolor(mode));
}
# endif # endif
#endif
#if ENABLE_FEATURE_LS_COLOR
if (show_color) {
printf("\033[%u;%um", bold(info.st_mode),
fgcolor(info.st_mode));
} }
#endif #endif
column += print_name(lpath) + 4; column += print_name(lpath) + 4;
if (show_color) { free(lpath);
if (G_show_color) {
printf("\033[0m"); printf("\033[0m");
} }
free(lpath);
} }
#if ENABLE_FEATURE_LS_FILETYPES #if ENABLE_FEATURE_LS_FILETYPES
if (all_fmt & LIST_FILETYPE) { if (G.all_fmt & LIST_FILETYPE) {
if (append) { if (append) {
putchar(append); putchar(append);
column++; column++;
@ -810,7 +861,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
unsigned nexttab; unsigned nexttab;
unsigned column_width = 0; /* used only by STYLE_COLUMNAR */ 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; ncols = 1;
} else { } else {
/* find the longest file name, use that as the column width */ /* find the longest file name, use that as the column width */
@ -820,10 +871,10 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
column_width = len; column_width = len;
} }
column_width += 1 + column_width += 1 +
IF_SELINUX( ((all_fmt & LIST_CONTEXT) ? 33 : 0) + ) IF_SELINUX( ((G.all_fmt & LIST_CONTEXT) ? 33 : 0) + )
((all_fmt & LIST_INO) ? 8 : 0) + ((G.all_fmt & LIST_INO) ? 8 : 0) +
((all_fmt & LIST_BLOCKS) ? 5 : 0); ((G.all_fmt & LIST_BLOCKS) ? 5 : 0);
ncols = (int) (terminal_width / column_width); ncols = (unsigned)G_terminal_width / column_width;
} }
if (ncols > 1) { if (ncols > 1) {
@ -840,7 +891,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
for (row = 0; row < nrows; row++) { for (row = 0; row < nrows; row++) {
for (nc = 0; nc < ncols; nc++) { for (nc = 0; nc < ncols; nc++) {
/* reach into the array based on the column and row */ /* 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 */ i = (row * ncols) + nc; /* display across row */
else else
i = (nc * nrows) + row; /* display by column */ i = (nc * nrows) + row; /* display by column */
@ -877,7 +928,7 @@ static off_t calculate_blocks(struct dnode **dn)
if (dn) { if (dn) {
while (*dn) { while (*dn) {
/* st_blocks is in 512 byte blocks */ /* st_blocks is in 512 byte blocks */
blocks += (*dn)->dstat.st_blocks; blocks += (*dn)->dn_blocks;
dn++; dn++;
} }
} }
@ -901,7 +952,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
*nfiles_p = 0; *nfiles_p = 0;
dir = warn_opendir(path); dir = warn_opendir(path);
if (dir == NULL) { if (dir == NULL) {
exit_code = EXIT_FAILURE; G.exit_code = EXIT_FAILURE;
return NULL; /* could not open the dir */ return NULL; /* could not open the dir */
} }
dn = NULL; dn = NULL;
@ -912,11 +963,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 */ /* are we going to list the file- it may be . or .. or a hidden file */
if (entry->d_name[0] == '.') { if (entry->d_name[0] == '.') {
if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2])) if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2]))
&& !(all_fmt & DISP_DOT) && !(G.all_fmt & DISP_DOT)
) { ) {
continue; continue;
} }
if (!(all_fmt & DISP_HIDDEN)) if (!(G.all_fmt & DISP_HIDDEN))
continue; continue;
} }
fullname = concat_path_file(path, entry->d_name); fullname = concat_path_file(path, entry->d_name);
@ -926,7 +977,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
continue; continue;
} }
cur->fname_allocated = 1; cur->fname_allocated = 1;
cur->next = dn; cur->dn_next = dn;
dn = cur; dn = cur;
nfiles++; nfiles++;
} }
@ -942,7 +993,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p)
dnp = dnalloc(nfiles); dnp = dnalloc(nfiles);
for (i = 0; /* i < nfiles - detected via !dn below */; i++) { for (i = 0; /* i < nfiles - detected via !dn below */; i++) {
dnp[i] = dn; /* save pointer to node in array */ dnp[i] = dn; /* save pointer to node in array */
dn = dn->next; dn = dn->dn_next;
if (!dn) if (!dn)
break; break;
} }
@ -957,7 +1008,7 @@ static void showdirs(struct dnode **dn, int first)
struct dnode **subdnp; struct dnode **subdnp;
for (; *dn; dn++) { for (; *dn; dn++) {
if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) { if (G.all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
if (!first) if (!first)
bb_putchar('\n'); bb_putchar('\n');
first = 0; first = 0;
@ -965,7 +1016,7 @@ static void showdirs(struct dnode **dn, int first)
} }
subdnp = list_dir((*dn)->fullname, &nfiles); subdnp = list_dir((*dn)->fullname, &nfiles);
#if ENABLE_DESKTOP #if ENABLE_DESKTOP
if ((all_fmt & STYLE_MASK) == STYLE_LONG) if ((G.all_fmt & STYLE_MASK) == STYLE_LONG)
printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp)); printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
#endif #endif
if (nfiles > 0) { if (nfiles > 0) {
@ -973,7 +1024,7 @@ static void showdirs(struct dnode **dn, int first)
dnsort(subdnp, nfiles); dnsort(subdnp, nfiles);
showfiles(subdnp, nfiles); showfiles(subdnp, nfiles);
if (ENABLE_FEATURE_LS_RECURSIVE if (ENABLE_FEATURE_LS_RECURSIVE
&& (all_fmt & DISP_RECURSIVE) && (G.all_fmt & DISP_RECURSIVE)
) { ) {
struct dnode **dnd; struct dnode **dnd;
unsigned dndirs; unsigned dndirs;
@ -1031,13 +1082,13 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
init_unicode(); init_unicode();
if (ENABLE_FEATURE_LS_SORTFILES) if (ENABLE_FEATURE_LS_SORTFILES)
all_fmt = SORT_NAME; G.all_fmt = SORT_NAME;
#if ENABLE_FEATURE_AUTOWIDTH #if ENABLE_FEATURE_AUTOWIDTH
/* obtain the terminal width */ /* 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... */ /* go one less... */
terminal_width--; G_terminal_width--;
#endif #endif
/* process options */ /* process options */
@ -1058,7 +1109,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
/* -w NUM: */ /* -w NUM: */
IF_FEATURE_AUTOWIDTH(":w+"); IF_FEATURE_AUTOWIDTH(":w+");
opt = getopt32(argv, ls_options opt = getopt32(argv, ls_options
IF_FEATURE_AUTOWIDTH(, NULL, &terminal_width) IF_FEATURE_AUTOWIDTH(, NULL, &G_terminal_width)
IF_FEATURE_LS_COLOR(, &color_opt) IF_FEATURE_LS_COLOR(, &color_opt)
); );
for (i = 0; opt_flags[i] != (1U << 31); i++) { for (i = 0; opt_flags[i] != (1U << 31); i++) {
@ -1066,27 +1117,27 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
uint32_t flags = opt_flags[i]; uint32_t flags = opt_flags[i];
if (flags & STYLE_MASK) if (flags & STYLE_MASK)
all_fmt &= ~STYLE_MASK; G.all_fmt &= ~STYLE_MASK;
if (flags & SORT_MASK) if (flags & SORT_MASK)
all_fmt &= ~SORT_MASK; G.all_fmt &= ~SORT_MASK;
if (flags & TIME_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 #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)) { if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) {
char *p = getenv("LS_COLORS"); char *p = getenv("LS_COLORS");
/* LS_COLORS is unset, or (not empty && not "none") ? */ /* LS_COLORS is unset, or (not empty && not "none") ? */
if (!p || (p[0] && strcmp(p, "none") != 0)) if (!p || (p[0] && strcmp(p, "none") != 0))
show_color = 1; G_show_color = 1;
} }
if (opt & OPT_color) { if (opt & OPT_color) {
if (color_opt[0] == 'n') if (color_opt[0] == 'n')
show_color = 0; G_show_color = 0;
else switch (index_in_substrings(color_str, color_opt)) { else switch (index_in_substrings(color_str, color_opt)) {
case 3: case 3:
case 4: case 4:
@ -1095,34 +1146,34 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
case 0: case 0:
case 1: case 1:
case 2: case 2:
show_color = 1; G_show_color = 1;
} }
} }
} }
#endif #endif
/* sort out which command line options take precedence */ /* sort out which command line options take precedence */
if (ENABLE_FEATURE_LS_RECURSIVE && (all_fmt & DISP_NOLIST)) if (ENABLE_FEATURE_LS_RECURSIVE && (G.all_fmt & DISP_NOLIST))
all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */ G.all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */
if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) { if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) {
if (all_fmt & TIME_CHANGE) if (G.all_fmt & TIME_CHANGE)
all_fmt = (all_fmt & ~SORT_MASK) | SORT_CTIME; G.all_fmt = (G.all_fmt & ~SORT_MASK) | SORT_CTIME;
if (all_fmt & TIME_ACCESS) if (G.all_fmt & TIME_ACCESS)
all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME; G.all_fmt = (G.all_fmt & ~SORT_MASK) | SORT_ATIME;
} }
if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* not -l? */ if ((G.all_fmt & STYLE_MASK) != STYLE_LONG) /* not -l? */
all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME); G.all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME);
/* choose a display format if one was not already specified by an option */ /* choose a display format if one was not already specified by an option */
if (!(all_fmt & STYLE_MASK)) if (!(G.all_fmt & STYLE_MASK))
all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNAR : STYLE_SINGLE); G.all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNAR : STYLE_SINGLE);
argv += optind; argv += optind;
if (!argv[0]) if (!argv[0])
*--argv = (char*)"."; *--argv = (char*)".";
if (argv[1]) 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 */ /* stuff the command line file names into a dnode array */
dn = NULL; dn = NULL;
@ -1130,8 +1181,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
do { do {
cur = my_stat(*argv, *argv, cur = my_stat(*argv, *argv,
/* follow links on command line unless -l, -s or -F: */ /* follow links on command line unless -l, -s or -F: */
!((all_fmt & STYLE_MASK) == STYLE_LONG !((G.all_fmt & STYLE_MASK) == STYLE_LONG
|| (all_fmt & LIST_BLOCKS) || (G.all_fmt & LIST_BLOCKS)
|| (option_mask32 & OPT_F) || (option_mask32 & OPT_F)
) )
/* ... or if -H: */ /* ... or if -H: */
@ -1141,15 +1192,15 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
argv++; argv++;
if (!cur) if (!cur)
continue; continue;
cur->fname_allocated = 0; /*cur->fname_allocated = 0; - already is */
cur->next = dn; cur->dn_next = dn;
dn = cur; dn = cur;
nfiles++; nfiles++;
} while (*argv); } while (*argv);
/* nfiles _may_ be 0 here - try "ls doesnt_exist" */ /* nfiles _may_ be 0 here - try "ls doesnt_exist" */
if (nfiles == 0) if (nfiles == 0)
return exit_code; return G.exit_code;
/* now that we know how many files there are /* now that we know how many files there are
* allocate memory for an array to hold dnode pointers * allocate memory for an array to hold dnode pointers
@ -1157,12 +1208,12 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
dnp = dnalloc(nfiles); dnp = dnalloc(nfiles);
for (i = 0; /* i < nfiles - detected via !dn below */; i++) { for (i = 0; /* i < nfiles - detected via !dn below */; i++) {
dnp[i] = dn; /* save pointer to node in array */ dnp[i] = dn; /* save pointer to node in array */
dn = dn->next; dn = dn->dn_next;
if (!dn) if (!dn)
break; break;
} }
if (all_fmt & DISP_NOLIST) { if (G.all_fmt & DISP_NOLIST) {
dnsort(dnp, nfiles); dnsort(dnp, nfiles);
showfiles(dnp, nfiles); showfiles(dnp, nfiles);
} else { } else {
@ -1183,7 +1234,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
free(dnd); free(dnd);
} }
} }
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
dfree(dnp); dfree(dnp);
return exit_code; return G.exit_code;
} }