Run through indent, fix BB_ define
This commit is contained in:
Glenn L McGrath
parent
99b12543cf
commit
e3906fcd94
210
coreutils/ls.c
210
coreutils/ls.c
@ -131,9 +131,8 @@ static const int TIME_ACCESS = 2;
|
||||
|
||||
#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_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;
|
||||
@ -142,12 +141,15 @@ static const int SPLIT_SUBDIR = 2;
|
||||
|
||||
#define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
|
||||
#define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [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"\
|
||||
@ -172,6 +174,7 @@ 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;
|
||||
@ -184,6 +187,7 @@ static unsigned int follow_links=FALSE;
|
||||
#endif
|
||||
|
||||
static unsigned short column = 0;
|
||||
|
||||
#ifdef CONFIG_FEATURE_AUTOWIDTH
|
||||
static unsigned short terminal_width = TERMINAL_WIDTH;
|
||||
static unsigned short column_width = COLUMN_WIDTH;
|
||||
@ -261,7 +265,8 @@ static char append_char(mode_t mode)
|
||||
if (!(list_fmt & LIST_FILETYPE))
|
||||
return '\0';
|
||||
if ((list_fmt & LIST_EXEC) && S_ISREG(mode)
|
||||
&& (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*';
|
||||
&& (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
|
||||
return '*';
|
||||
return APPCHAR(mode);
|
||||
}
|
||||
#endif
|
||||
@ -274,7 +279,8 @@ static void nexttabstop( void )
|
||||
|
||||
if (column > 0) {
|
||||
n = nexttab - column;
|
||||
if (n < 1) n= 1;
|
||||
if (n < 1)
|
||||
n = 1;
|
||||
while (n--) {
|
||||
putchar(' ');
|
||||
column++;
|
||||
@ -294,10 +300,12 @@ static int countdirs(struct dnode **dn, int nfiles)
|
||||
{
|
||||
int i, dirs;
|
||||
|
||||
if (dn==NULL || nfiles < 1) return(0);
|
||||
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 (S_ISDIR(dn[i]->dstat.st_mode))
|
||||
dirs++;
|
||||
}
|
||||
return (dirs);
|
||||
}
|
||||
@ -306,7 +314,8 @@ static int countsubdirs(struct dnode **dn, int nfiles)
|
||||
{
|
||||
int i, subdirs;
|
||||
|
||||
if (dn == NULL || nfiles < 1) return 0;
|
||||
if (dn == NULL || nfiles < 1)
|
||||
return 0;
|
||||
subdirs = 0;
|
||||
for (i = 0; i < nfiles; i++)
|
||||
if (is_subdir(dn[i]))
|
||||
@ -319,9 +328,11 @@ static int countfiles(struct dnode **dnp)
|
||||
int nfiles;
|
||||
struct dnode *cur;
|
||||
|
||||
if (dnp == NULL) return(0);
|
||||
if (dnp == NULL)
|
||||
return (0);
|
||||
nfiles = 0;
|
||||
for (cur= dnp[0]; cur->next != NULL ; cur= cur->next) nfiles++;
|
||||
for (cur = dnp[0]; cur->next != NULL; cur = cur->next)
|
||||
nfiles++;
|
||||
nfiles++;
|
||||
return (nfiles);
|
||||
}
|
||||
@ -331,9 +342,11 @@ 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 *)));
|
||||
p = (struct dnode **) xcalloc((size_t) num,
|
||||
(size_t) (sizeof(struct dnode *)));
|
||||
return (p);
|
||||
}
|
||||
|
||||
@ -342,11 +355,13 @@ static void dfree(struct dnode **dnp)
|
||||
{
|
||||
struct dnode *cur, *next;
|
||||
|
||||
if(dnp == NULL) return;
|
||||
if (dnp == NULL)
|
||||
return;
|
||||
|
||||
cur = dnp[0];
|
||||
while (cur != NULL) {
|
||||
if (cur->fullname != NULL) free(cur->fullname); /* free the filename */
|
||||
if (cur->fullname != NULL)
|
||||
free(cur->fullname); /* free the filename */
|
||||
next = cur->next;
|
||||
free(cur); /* free the dnode */
|
||||
cur = next;
|
||||
@ -360,7 +375,8 @@ 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)
|
||||
@ -416,13 +432,17 @@ static int sortcmp(struct dnode *d1, struct dnode *d2)
|
||||
dif = 0;
|
||||
}
|
||||
|
||||
if (dif > 0) cmp= -1;
|
||||
if (dif < 0) cmp= 1;
|
||||
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 (dif > 0)
|
||||
cmp = 1;
|
||||
if (dif < 0)
|
||||
cmp = -1;
|
||||
}
|
||||
|
||||
if (sort_order == SORT_REVERSE) {
|
||||
@ -438,7 +458,8 @@ static void shellsort(struct dnode **dn, int size)
|
||||
int gap, i, j;
|
||||
|
||||
/* shell short the array */
|
||||
if(dn==NULL || size < 2) return;
|
||||
if (dn == NULL || size < 2)
|
||||
return;
|
||||
|
||||
for (gap = size / 2; gap > 0; gap /= 2) {
|
||||
for (i = gap; i < size; i++) {
|
||||
@ -459,11 +480,13 @@ static void shellsort(struct dnode **dn, int size)
|
||||
static void showfiles(struct dnode **dn, int nfiles)
|
||||
{
|
||||
int i, ncols, nrows, row, nc;
|
||||
|
||||
#ifdef CONFIG_FEATURE_AUTOWIDTH
|
||||
int len;
|
||||
#endif
|
||||
|
||||
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 */
|
||||
@ -471,8 +494,7 @@ static void showfiles(struct dnode **dn, int nfiles)
|
||||
for (i = 0; i < nfiles; i++) {
|
||||
len = strlen(dn[i]->name) +
|
||||
((list_fmt & LIST_INO) ? 8 : 0) +
|
||||
((list_fmt & LIST_BLOCKS) ? 5 : 0)
|
||||
;
|
||||
((list_fmt & LIST_BLOCKS) ? 5 : 0);
|
||||
if (column_width < len)
|
||||
column_width = len;
|
||||
}
|
||||
@ -493,9 +515,11 @@ static void showfiles(struct dnode **dn, int nfiles)
|
||||
nrows = nfiles;
|
||||
ncols = 1;
|
||||
}
|
||||
if ((nrows * ncols) < nfiles) nrows++; /* round up fractionals */
|
||||
if ((nrows * ncols) < nfiles)
|
||||
nrows++; /* round up fractionals */
|
||||
|
||||
if (nrows > nfiles) nrows= nfiles;
|
||||
if (nrows > nfiles)
|
||||
nrows = nfiles;
|
||||
for (row = 0; row < nrows; row++) {
|
||||
for (nc = 0; nc < ncols; nc++) {
|
||||
/* reach into the array based on the column and row */
|
||||
@ -516,12 +540,14 @@ static void showdirs(struct dnode **dn, int ndirs)
|
||||
{
|
||||
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)) {
|
||||
@ -562,7 +588,8 @@ static struct dnode **list_dir(char *path)
|
||||
DIR *dir;
|
||||
int i, nfiles;
|
||||
|
||||
if (path==NULL) return(NULL);
|
||||
if (path == NULL)
|
||||
return (NULL);
|
||||
|
||||
dn = NULL;
|
||||
nfiles = 0;
|
||||
@ -595,7 +622,8 @@ static struct dnode **list_dir(char *path)
|
||||
/* now that we know how many files there are
|
||||
** allocate memory for an array to hold dnode pointers
|
||||
*/
|
||||
if (nfiles < 1) return(NULL);
|
||||
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 */
|
||||
@ -609,6 +637,7 @@ static struct dnode **list_dir(char *path)
|
||||
static int list_single(struct dnode *dn)
|
||||
{
|
||||
int i;
|
||||
|
||||
#ifdef CONFIG_FEATURE_LS_USERNAME
|
||||
char scratch[BUFSIZ + 1];
|
||||
#endif
|
||||
@ -621,12 +650,15 @@ static int list_single(struct dnode *dn)
|
||||
char append;
|
||||
#endif
|
||||
|
||||
if (dn==NULL || dn->fullname==NULL) return(0);
|
||||
if (dn == NULL || 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;
|
||||
if (time_fmt & TIME_ACCESS)
|
||||
ttime = dn->dstat.st_atime;
|
||||
if (time_fmt & TIME_CHANGE)
|
||||
ttime = dn->dstat.st_ctime;
|
||||
filetime = ctime(&ttime);
|
||||
#endif
|
||||
#ifdef CONFIG_FEATURE_LS_FILETYPES
|
||||
@ -641,8 +673,11 @@ static int list_single(struct dnode *dn)
|
||||
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));
|
||||
fprintf(stdout, "%6s ",
|
||||
make_human_readable_str(dn->dstat.st_blocks >> 1,
|
||||
KILOBYTE,
|
||||
(ls_disp_hr ==
|
||||
TRUE) ? 0 : KILOBYTE));
|
||||
#else
|
||||
#if _FILE_OFFSET_BITS == 64
|
||||
printf("%4lld ", dn->dstat.st_blocks >> 1);
|
||||
@ -676,11 +711,13 @@ static int list_single(struct dnode *dn)
|
||||
case LIST_SIZE:
|
||||
case LIST_DEV:
|
||||
if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) {
|
||||
printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev));
|
||||
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));
|
||||
fprintf(stdout, "%8s ",
|
||||
make_human_readable_str(dn->dstat.st_size, 1, 0));
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
@ -731,9 +768,10 @@ static int list_single(struct dnode *dn)
|
||||
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 defined(CONFIG_FEATURE_LS_FILETYPES) || defined (CONFIG_FEATURE_LS_COLOR)
|
||||
if (!stat(dn->fullname, &info)) {
|
||||
append = append_char(info.st_mode);
|
||||
}
|
||||
@ -780,6 +818,7 @@ extern int ls_main(int argc, char **argv)
|
||||
int opt;
|
||||
int oi, ac;
|
||||
char **av;
|
||||
|
||||
#ifdef CONFIG_FEATURE_AUTOWIDTH
|
||||
struct winsize win = { 0, 0, 0, 0 };
|
||||
#endif
|
||||
@ -833,13 +872,26 @@ extern int ls_main(int argc, char **argv)
|
||||
#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 '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;
|
||||
@ -847,24 +899,46 @@ extern int ls_main(int argc, char **argv)
|
||||
ls_disp_hr = FALSE;
|
||||
#endif
|
||||
break;
|
||||
case 'n': list_fmt |= LIST_ID_NUMERIC; break;
|
||||
case 's': list_fmt |= LIST_BLOCKS; break;
|
||||
case 'x': disp_opts = DISP_ROWS; 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;
|
||||
case 'F':
|
||||
list_fmt |= LIST_FILETYPE | LIST_EXEC;
|
||||
break;
|
||||
case 'p':
|
||||
list_fmt |= LIST_FILETYPE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_FEATURE_LS_RECURSIVE
|
||||
case 'R': disp_opts |= DISP_RECURSIVE; break;
|
||||
case 'R':
|
||||
disp_opts |= DISP_RECURSIVE;
|
||||
break;
|
||||
#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;
|
||||
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;
|
||||
#endif
|
||||
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
|
||||
case 'e': list_fmt |= LIST_FULLTIME; break;
|
||||
case 'e':
|
||||
list_fmt |= LIST_FULLTIME;
|
||||
break;
|
||||
case 'c':
|
||||
time_fmt = TIME_CHANGE;
|
||||
#ifdef CONFIG_FEATURE_LS_SORTFILES
|
||||
@ -884,16 +958,25 @@ extern int ls_main(int argc, char **argv)
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
|
||||
case 'L': follow_links= TRUE; break;
|
||||
case 'L':
|
||||
follow_links = TRUE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_FEATURE_AUTOWIDTH
|
||||
case 'T': tabstops= atoi(optarg); break;
|
||||
case 'w': terminal_width= atoi(optarg); break;
|
||||
case 'T':
|
||||
tabstops = atoi(optarg);
|
||||
break;
|
||||
case 'w':
|
||||
terminal_width = atoi(optarg);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_FEATURE_HUMAN_READABLE
|
||||
case 'h': ls_disp_hr = TRUE; break;
|
||||
case 'h':
|
||||
ls_disp_hr = TRUE;
|
||||
break;
|
||||
#endif
|
||||
case 'k': break;
|
||||
case 'k':
|
||||
break;
|
||||
default:
|
||||
goto print_usage_message;
|
||||
}
|
||||
@ -905,8 +988,10 @@ extern int ls_main(int argc, char **argv)
|
||||
disp_opts &= ~DISP_RECURSIVE; /* no recurse if listing only dir */
|
||||
#endif
|
||||
#if defined (CONFIG_FEATURE_LS_TIMESTAMPS) && defined (CONFIG_FEATURE_LS_SORTFILES)
|
||||
if (time_fmt & TIME_CHANGE) sort_opts= SORT_CTIME;
|
||||
if (time_fmt & TIME_ACCESS) sort_opts= SORT_ATIME;
|
||||
if (time_fmt & TIME_CHANGE)
|
||||
sort_opts = SORT_CTIME;
|
||||
if (time_fmt & TIME_ACCESS)
|
||||
sort_opts = SORT_ATIME;
|
||||
#endif
|
||||
if (style_fmt != STYLE_LONG)
|
||||
list_fmt &= ~LIST_ID_NUMERIC; /* numeric uid only for long list */
|
||||
@ -969,7 +1054,8 @@ extern int ls_main(int argc, char **argv)
|
||||
#ifdef CONFIG_FEATURE_LS_SORTFILES
|
||||
shellsort(dnp, nfiles);
|
||||
#endif
|
||||
if (nfiles > 0) showfiles(dnp, nfiles);
|
||||
if (nfiles > 0)
|
||||
showfiles(dnp, nfiles);
|
||||
} else {
|
||||
dnd = splitdnarray(dnp, nfiles, SPLIT_DIR);
|
||||
dnf = splitdnarray(dnp, nfiles, SPLIT_FILE);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user