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

ls: cleanup part 1

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-28 12:37:16 +00:00
parent 8c35d65c43
commit 5c7596058d
8 changed files with 191 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils/dd.c
View File

@ -29,8 +29,8 @@ static off_t out_full, out_part, in_full, in_part;
static void dd_output_status(int ATTRIBUTE_UNUSED cur_signal) static void dd_output_status(int ATTRIBUTE_UNUSED cur_signal)
{ {
fprintf(stderr, OFF_FMT"+"OFF_FMT" records in\n" fprintf(stderr, "%"OFF_FMT"+%"OFF_FMT" records in\n"
OFF_FMT"+"OFF_FMT" records out\n", "%"OFF_FMT"+%"OFF_FMT" records out\n",
in_full, in_part, in_full, in_part,
out_full, out_part); out_full, out_part);
} }

448
coreutils/ls.c
View File

@ -98,18 +98,18 @@ enum {
#define TIME_ACCESS ((1U<<24) * ENABLE_FEATURE_LS_TIMESTAMPS) #define TIME_ACCESS ((1U<<24) * ENABLE_FEATURE_LS_TIMESTAMPS)
#define TIME_MASK ((3U<<23) * ENABLE_FEATURE_LS_TIMESTAMPS) #define TIME_MASK ((3U<<23) * ENABLE_FEATURE_LS_TIMESTAMPS)
#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS #if ENABLE_FEATURE_LS_FOLLOWLINKS
#define FOLLOW_LINKS (1U<<25) #define FOLLOW_LINKS (1U<<25)
#endif #endif
#ifdef CONFIG_FEATURE_HUMAN_READABLE #if ENABLE_FEATURE_HUMAN_READABLE
#define LS_DISP_HR (1U<<26) #define LS_DISP_HR (1U<<26)
#endif #endif
#define LIST_SHORT (LIST_FILENAME) #define LIST_SHORT (LIST_FILENAME)
#define LIST_ISHORT (LIST_INO | LIST_FILENAME) //#define LIST_ISHORT (LIST_INO | LIST_FILENAME)
#define LIST_LONG (LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \ #define LIST_LONG (LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK) LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK)
#define LIST_ILONG (LIST_INO | LIST_LONG) //#define LIST_ILONG (LIST_INO | LIST_LONG)
#define SPLIT_DIR 1 #define SPLIT_DIR 1
#define SPLIT_FILE 0 #define SPLIT_FILE 0
@ -123,22 +123,23 @@ enum {
#endif #endif
/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */ /* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
static int show_color = 0; static int show_color;
/* long option entry used only for --color, which has no short option /* long option entry used only for --color, which has no short option
* equivalent. */ * equivalent. */
static const struct option ls_color_opt[] = static const struct option ls_color_opt[] = {
{ { "color", optional_argument, NULL, 1 },
{"color", optional_argument, NULL, 1}, { NULL, 0, NULL, 0 }
{NULL, 0, NULL, 0}
}; };
#define COLOR(mode) ("\000\043\043\043\042\000\043\043"\ #define COLOR(mode) ("\000\043\043\043\042\000\043\043"\
"\000\000\044\000\043\000\000\040" [TYPEINDEX(mode)]) "\000\000\044\000\043\000\000\040" [TYPEINDEX(mode)])
#define ATTR(mode) ("\00\00\01\00\01\00\01\00"\ #define ATTR(mode) ("\00\00\01\00\01\00\01\00"\
"\00\00\01\00\01\00\00\01" [TYPEINDEX(mode)]) "\00\00\01\00\01\00\00\01" [TYPEINDEX(mode)])
#else
enum { show_color = 0 };
#endif #endif
/* /*
@ -149,9 +150,7 @@ struct dnode { /* the basic node */
char *fullname; /* the dir entry name */ char *fullname; /* the dir entry name */
int allocated; int allocated;
struct stat dstat; /* the file stat info */ struct stat dstat; /* the file stat info */
#ifdef CONFIG_SELINUX USE_SELINUX(security_context_t sid;)
security_context_t sid;
#endif
struct dnode *next; /* point at the next node */ struct dnode *next; /* point at the next node */
}; };
typedef struct dnode dnode_t; typedef struct dnode dnode_t;
@ -160,14 +159,16 @@ static struct dnode **list_dir(const char *);
static struct dnode **dnalloc(int); static struct dnode **dnalloc(int);
static int list_single(struct dnode *); static int list_single(struct dnode *);
static unsigned int all_fmt; static unsigned all_fmt;
#ifdef CONFIG_FEATURE_AUTOWIDTH #if ENABLE_FEATURE_AUTOWIDTH
static unsigned terminal_width = TERMINAL_WIDTH;
static unsigned tabstops = COLUMN_GAP; static unsigned tabstops = COLUMN_GAP;
static unsigned terminal_width = TERMINAL_WIDTH;
#else #else
#define tabstops COLUMN_GAP enum {
#define terminal_width TERMINAL_WIDTH tabstops = COLUMN_GAP,
terminal_width = TERMINAL_WIDTH,
};
#endif #endif
static int status = EXIT_SUCCESS; static int status = EXIT_SUCCESS;
@ -176,15 +177,12 @@ static struct dnode *my_stat(char *fullname, char *name)
{ {
struct stat dstat; struct stat dstat;
struct dnode *cur; struct dnode *cur;
#ifdef CONFIG_SELINUX USE_SELINUX(security_context_t sid = NULL;)
security_context_t sid=NULL;
#endif
#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS if (ENABLE_FEATURE_LS_FOLLOWLINKS && (all_fmt & FOLLOW_LINKS)) {
if (all_fmt & FOLLOW_LINKS) { #if ENABLE_SELINUX
#ifdef CONFIG_SELINUX
if (is_selinux_enabled()) { if (is_selinux_enabled()) {
getfilecon(fullname,&sid); getfilecon(fullname, &sid);
} }
#endif #endif
if (stat(fullname, &dstat)) { if (stat(fullname, &dstat)) {
@ -192,12 +190,10 @@ static struct dnode *my_stat(char *fullname, char *name)
status = EXIT_FAILURE; status = EXIT_FAILURE;
return 0; return 0;
} }
} else } else {
#endif #if ENABLE_SELINUX
{ if (is_selinux_enabled()) {
#ifdef CONFIG_SELINUX lgetfilecon(fullname,&sid);
if (is_selinux_enabled()) {
lgetfilecon(fullname,&sid);
} }
#endif #endif
if (lstat(fullname, &dstat)) { if (lstat(fullname, &dstat)) {
@ -207,24 +203,21 @@ static struct dnode *my_stat(char *fullname, char *name)
} }
} }
cur = (struct dnode *) xmalloc(sizeof(struct dnode)); cur = xmalloc(sizeof(struct dnode));
cur->fullname = fullname; cur->fullname = fullname;
cur->name = name; cur->name = name;
cur->dstat = dstat; cur->dstat = dstat;
#ifdef CONFIG_SELINUX USE_SELINUX(cur->sid = sid;)
cur->sid = sid;
#endif
return cur; return cur;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
static char fgcolor(mode_t mode) static char fgcolor(mode_t mode)
{ {
/* Check wheter the file is existing (if so, color it red!) */ /* Check wheter the file is existing (if so, color it red!) */
if (errno == ENOENT) { if (errno == ENOENT)
return '\037'; return '\037';
}
if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
return COLOR(0xF000); /* File is executable ... */ return COLOR(0xF000); /* File is executable ... */
return COLOR(mode); return COLOR(mode);
@ -240,7 +233,7 @@ static char bgcolor(mode_t mode)
#endif #endif
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR) #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
static char append_char(mode_t mode) static char append_char(mode_t mode)
{ {
if (!(all_fmt & LIST_FILETYPE)) if (!(all_fmt & LIST_FILETYPE))
@ -257,25 +250,28 @@ static char append_char(mode_t mode)
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#define countdirs(A,B) count_dirs((A), (B), 1) #define countdirs(A, B) count_dirs((A), (B), 1)
#define countsubdirs(A,B) count_dirs((A), (B), 0) #define countsubdirs(A, B) count_dirs((A), (B), 0)
static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs) static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs)
{ {
int i, dirs; int i, dirs;
if (dn == NULL || nfiles < 1) if (!dn)
return (0); return 0;
dirs = 0; dirs = 0;
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++) {
if (S_ISDIR(dn[i]->dstat.st_mode) char *name;
&& (notsubdirs || if (!S_ISDIR(dn[i]->dstat.st_mode))
((dn[i]->name[0] != '.') || (dn[i]->name[1] continue;
&& ((dn[i]->name[1] != '.') name = dn[i]->name;
|| dn[i]->name[2]))))) if (notsubdirs
|| name[0]!='.' || (name[1] && (name[1]!='.' || name[2]))
) {
dirs++; dirs++;
}
} }
return (dirs); return dirs;
} }
static int countfiles(struct dnode **dnp) static int countfiles(struct dnode **dnp)
@ -284,27 +280,24 @@ static int countfiles(struct dnode **dnp)
struct dnode *cur; struct dnode *cur;
if (dnp == NULL) if (dnp == NULL)
return (0); return 0;
nfiles = 0; nfiles = 0;
for (cur = dnp[0]; cur->next != NULL; cur = cur->next) for (cur = dnp[0]; cur->next != NULL; cur = cur->next)
nfiles++; nfiles++;
nfiles++; nfiles++;
return (nfiles); return nfiles;
} }
/* get memory to hold an array of pointers */ /* get memory to hold an array of pointers */
static struct dnode **dnalloc(int num) static struct dnode **dnalloc(int num)
{ {
struct dnode **p;
if (num < 1) if (num < 1)
return (NULL); return NULL;
p = (struct dnode **) xzalloc(num * sizeof(struct dnode *)); return xzalloc(num * sizeof(struct dnode *));
return (p);
} }
#ifdef CONFIG_FEATURE_LS_RECURSIVE #if ENABLE_FEATURE_LS_RECURSIVE
static void dfree(struct dnode **dnp, int nfiles) static void dfree(struct dnode **dnp, int nfiles)
{ {
int i; int i;
@ -314,14 +307,14 @@ static void dfree(struct dnode **dnp, int nfiles)
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++) {
struct dnode *cur = dnp[i]; struct dnode *cur = dnp[i];
if(cur->allocated) if (cur->allocated)
free(cur->fullname); /* free the filename */ free(cur->fullname); /* free the filename */
free(cur); /* free the dnode */ free(cur); /* free the dnode */
} }
free(dnp); /* free the array holding the dnode pointers */ free(dnp); /* free the array holding the dnode pointers */
} }
#else #else
#define dfree(...) #define dfree(...) do {} while(0)
#endif #endif
static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which) static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
@ -330,7 +323,7 @@ static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
struct dnode **dnp; struct dnode **dnp;
if (dn == NULL || nfiles < 1) if (dn == NULL || nfiles < 1)
return (NULL); return NULL;
/* count how many dirs and regular files there are */ /* count how many dirs and regular files there are */
if (which == SPLIT_SUBDIR) if (which == SPLIT_SUBDIR)
@ -347,29 +340,29 @@ static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)
/* copy the entrys into the file or dir array */ /* copy the entrys into the file or dir array */
for (d = i = 0; i < nfiles; i++) { for (d = i = 0; i < nfiles; i++) {
if (S_ISDIR(dn[i]->dstat.st_mode)) { if (S_ISDIR(dn[i]->dstat.st_mode)) {
if (which & (SPLIT_DIR|SPLIT_SUBDIR)) { char *name;
if ((which & SPLIT_DIR) if (!(which & (SPLIT_DIR|SPLIT_SUBDIR)))
|| ((dn[i]->name[0] != '.') continue;
|| (dn[i]->name[1] name = dn[i]->name;
&& ((dn[i]->name[1] != '.') if ((which & SPLIT_DIR)
|| dn[i]->name[2])))) { || name[0]!='.' || (name[1] && (name[1]!='.' || name[2]))
dnp[d++] = dn[i]; ) {
} dnp[d++] = dn[i];
} }
} else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) { } else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) {
dnp[d++] = dn[i]; dnp[d++] = dn[i];
} }
} }
return (dnp); return dnp;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#ifdef CONFIG_FEATURE_LS_SORTFILES #if ENABLE_FEATURE_LS_SORTFILES
static int sortcmp(const void *a, const void *b) 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 int sort_opts = all_fmt & SORT_MASK; unsigned sort_opts = all_fmt & SORT_MASK;
int dif; int dif;
dif = 0; /* assume SORT_NAME */ dif = 0; /* assume SORT_NAME */
@ -396,7 +389,7 @@ static int sortcmp(const void *a, const void *b)
if (all_fmt & SORT_ORDER_REVERSE) { if (all_fmt & SORT_ORDER_REVERSE) {
dif = -dif; dif = -dif;
} }
return (dif); return dif;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
@ -406,7 +399,7 @@ static void dnsort(struct dnode **dn, int size)
} }
#else #else
#define sortcmp(a, b) 0 #define sortcmp(a, b) 0
#define dnsort(dn, size) #define dnsort(dn, size) do {} while(0)
#endif #endif
@ -427,7 +420,7 @@ static void showfiles(struct dnode **dn, int nfiles)
/* find the longest file name- use that as the column width */ /* find the longest file name- use that as the column width */
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++) {
int len = strlen(dn[i]->name) + int len = strlen(dn[i]->name) +
#ifdef CONFIG_SELINUX #if ENABLE_SELINUX
((all_fmt & LIST_CONTEXT) ? 33 : 0) + ((all_fmt & LIST_CONTEXT) ? 33 : 0) +
#endif #endif
((all_fmt & LIST_INO) ? 8 : 0) + ((all_fmt & LIST_INO) ? 8 : 0) +
@ -457,14 +450,12 @@ static void showfiles(struct dnode **dn, int nfiles)
if (i < nfiles) { if (i < nfiles) {
if (column > 0) { if (column > 0) {
nexttab -= column; nexttab -= column;
while (nexttab--) { printf("%*s", nexttab, "");
putchar(' '); column += nexttab;
column++; }
}
}
nexttab = column + column_width; nexttab = column + column_width;
column += list_single(dn[i]); column += list_single(dn[i]);
} }
} }
putchar('\n'); putchar('\n');
column = 0; column = 0;
@ -523,14 +514,14 @@ static struct dnode **list_dir(const char *path)
int i, nfiles; int i, nfiles;
if (path == NULL) if (path == NULL)
return (NULL); return NULL;
dn = NULL; dn = NULL;
nfiles = 0; nfiles = 0;
dir = warn_opendir(path); dir = warn_opendir(path);
if (dir == NULL) { if (dir == NULL) {
status = EXIT_FAILURE; status = EXIT_FAILURE;
return (NULL); /* could not open the dir */ return NULL; /* could not open the dir */
} }
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
char *fullname; char *fullname;
@ -547,8 +538,10 @@ static struct dnode **list_dir(const char *path)
} }
fullname = concat_path_file(path, entry->d_name); fullname = concat_path_file(path, entry->d_name);
cur = my_stat(fullname, strrchr(fullname, '/') + 1); cur = my_stat(fullname, strrchr(fullname, '/') + 1);
if (!cur) if (!cur) {
// FIXME: free(fullname); ?
continue; continue;
}
cur->allocated = 1; cur->allocated = 1;
cur->next = dn; cur->next = dn;
dn = cur; dn = cur;
@ -560,14 +553,14 @@ static struct dnode **list_dir(const char *path)
** allocate memory for an array to hold dnode pointers ** allocate memory for an array to hold dnode pointers
*/ */
if (dn == NULL) if (dn == NULL)
return (NULL); return NULL;
dnp = dnalloc(nfiles); dnp = dnalloc(nfiles);
for (i = 0, cur = dn; i < nfiles; i++) { for (i = 0, cur = dn; i < nfiles; i++) {
dnp[i] = cur; /* save pointer to node in array */ dnp[i] = cur; /* save pointer to node in array */
cur = cur->next; cur = cur->next;
} }
return (dnp); return dnp;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
@ -575,22 +568,22 @@ static int list_single(struct dnode *dn)
{ {
int i, column = 0; int i, column = 0;
#ifdef CONFIG_FEATURE_LS_USERNAME #if ENABLE_FEATURE_LS_USERNAME
char scratch[16]; char scratch[16];
#endif #endif
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
char *filetime; char *filetime;
time_t ttime, age; time_t ttime, age;
#endif #endif
#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined (CONFIG_FEATURE_LS_COLOR) #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
struct stat info; struct stat info;
char append; char append;
#endif #endif
if (dn->fullname == NULL) if (dn->fullname == NULL)
return (0); return 0;
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
ttime = dn->dstat.st_mtime; /* the default time */ ttime = dn->dstat.st_mtime; /* the default time */
if (all_fmt & TIME_ACCESS) if (all_fmt & TIME_ACCESS)
ttime = dn->dstat.st_atime; ttime = dn->dstat.st_atime;
@ -598,21 +591,17 @@ static int list_single(struct dnode *dn)
ttime = dn->dstat.st_ctime; ttime = dn->dstat.st_ctime;
filetime = ctime(&ttime); filetime = ctime(&ttime);
#endif #endif
#ifdef CONFIG_FEATURE_LS_FILETYPES #if ENABLE_FEATURE_LS_FILETYPES
append = append_char(dn->dstat.st_mode); append = append_char(dn->dstat.st_mode);
#endif #endif
for (i = 0; i <= 31; i++) { for (i = 0; i <= 31; i++) {
switch (all_fmt & (1 << i)) { switch (all_fmt & (1 << i)) {
case LIST_INO: case LIST_INO:
column += printf("%7ld ", (long int) dn->dstat.st_ino); column += printf("%7ld ", (long) dn->dstat.st_ino);
break; break;
case LIST_BLOCKS: case LIST_BLOCKS:
#if _FILE_OFFSET_BITS == 64 column += printf("%4"OFF_FMT" ", (off_t) dn->dstat.st_blocks >> 1);
column += printf("%4lld ", (long long)dn->dstat.st_blocks >> 1);
#else
column += printf("%4ld ", dn->dstat.st_blocks >> 1);
#endif
break; break;
case LIST_MODEBITS: case LIST_MODEBITS:
column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode)); column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode));
@ -621,7 +610,7 @@ static int list_single(struct dnode *dn)
column += printf("%4ld ", (long) dn->dstat.st_nlink); column += printf("%4ld ", (long) dn->dstat.st_nlink);
break; break;
case LIST_ID_NAME: case LIST_ID_NAME:
#ifdef CONFIG_FEATURE_LS_USERNAME #if ENABLE_FEATURE_LS_USERNAME
bb_getpwuid(scratch, dn->dstat.st_uid, sizeof(scratch)); bb_getpwuid(scratch, dn->dstat.st_uid, sizeof(scratch));
printf("%-8.8s ", scratch); printf("%-8.8s ", scratch);
bb_getgrgid(scratch, dn->dstat.st_gid, sizeof(scratch)); bb_getgrgid(scratch, dn->dstat.st_gid, sizeof(scratch));
@ -638,22 +627,15 @@ static int list_single(struct dnode *dn)
column += printf("%4d, %3d ", (int) major(dn->dstat.st_rdev), column += printf("%4d, %3d ", (int) major(dn->dstat.st_rdev),
(int) minor(dn->dstat.st_rdev)); (int) minor(dn->dstat.st_rdev));
} else { } else {
#ifdef CONFIG_FEATURE_HUMAN_READABLE if (ENABLE_FEATURE_HUMAN_READABLE && (all_fmt & LS_DISP_HR)) {
if (all_fmt & LS_DISP_HR) {
column += printf("%9s ", column += printf("%9s ",
make_human_readable_str(dn->dstat.st_size, 1, 0)); make_human_readable_str(dn->dstat.st_size, 1, 0));
} else } else {
#endif column += printf("%9"OFF_FMT" ", (off_t) dn->dstat.st_size);
{
#if _FILE_OFFSET_BITS == 64
column += printf("%9lld ", (long long) dn->dstat.st_size);
#else
column += printf("%9ld ", dn->dstat.st_size);
#endif
} }
} }
break; break;
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
case LIST_FULLTIME: case LIST_FULLTIME:
printf("%24.24s ", filetime); printf("%24.24s ", filetime);
column += 25; column += 25;
@ -672,7 +654,7 @@ static int list_single(struct dnode *dn)
} }
break; break;
#endif #endif
#ifdef CONFIG_SELINUX #if ENABLE_SELINUX
case LIST_CONTEXT: case LIST_CONTEXT:
{ {
char context[80]; char context[80];
@ -692,19 +674,15 @@ static int list_single(struct dnode *dn)
break; break;
#endif #endif
case LIST_FILENAME: case LIST_FILENAME:
#ifdef CONFIG_FEATURE_LS_COLOR
errno = 0; errno = 0;
if (show_color && !lstat(dn->fullname, &info)) { if (show_color && !lstat(dn->fullname, &info)) {
printf("\033[%d;%dm", bgcolor(info.st_mode), printf("\033[%d;%dm", bgcolor(info.st_mode),
fgcolor(info.st_mode)); fgcolor(info.st_mode));
} }
#endif
column += printf("%s", dn->name); column += printf("%s", dn->name);
#ifdef CONFIG_FEATURE_LS_COLOR
if (show_color) { if (show_color) {
printf("\033[0m"); printf("\033[0m");
} }
#endif
break; break;
case LIST_SYMLINK: case LIST_SYMLINK:
if (S_ISLNK(dn->dstat.st_mode)) { if (S_ISLNK(dn->dstat.st_mode)) {
@ -717,24 +695,20 @@ static int list_single(struct dnode *dn)
append = append_char(info.st_mode); append = append_char(info.st_mode);
} }
#endif #endif
#ifdef CONFIG_FEATURE_LS_COLOR
if (show_color) { if (show_color) {
errno = 0; errno = 0;
printf("\033[%d;%dm", bgcolor(info.st_mode), printf("\033[%d;%dm", bgcolor(info.st_mode),
fgcolor(info.st_mode)); fgcolor(info.st_mode));
} }
#endif
column += printf("%s", lpath) + 4; column += printf("%s", lpath) + 4;
#ifdef CONFIG_FEATURE_LS_COLOR
if (show_color) { if (show_color) {
printf("\033[0m"); printf("\033[0m");
} }
#endif
free(lpath); free(lpath);
} }
} }
break; break;
#ifdef CONFIG_FEATURE_LS_FILETYPES #if ENABLE_FEATURE_LS_FILETYPES
case LIST_FILETYPE: case LIST_FILETYPE:
if (append != '\0') { if (append != '\0') {
printf("%1c", append); printf("%1c", append);
@ -759,57 +733,15 @@ static int list_single(struct dnode *dn)
/* "[-]K", SELinux mandated options, busybox optionally supports */ /* "[-]K", SELinux mandated options, busybox optionally supports */
/* "[-]e", I think we made this one up */ /* "[-]e", I think we made this one up */
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS static const char ls_options[] = "Cadil1gnsxAk"
# define LS_STR_TIMESTAMPS "cetu" USE_FEATURE_LS_TIMESTAMPS("cetu")
#else USE_FEATURE_LS_SORTFILES("SXrv")
# define LS_STR_TIMESTAMPS "" USE_FEATURE_LS_FILETYPES("Fp")
#endif USE_FEATURE_LS_FOLLOWLINKS("L")
USE_FEATURE_LS_RECURSIVE("R")
#ifdef CONFIG_FEATURE_LS_FILETYPES USE_FEATURE_HUMAN_READABLE("h")
# define LS_STR_FILETYPES "Fp" USE_SELINUX("K")
#else USE_FEATURE_AUTOWIDTH("T:w:");
# define LS_STR_FILETYPES ""
#endif
#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
# define LS_STR_FOLLOW_LINKS "L"
#else
# define LS_STR_FOLLOW_LINKS ""
#endif
#ifdef CONFIG_FEATURE_LS_RECURSIVE
# define LS_STR_RECURSIVE "R"
#else
# define LS_STR_RECURSIVE ""
#endif
#ifdef CONFIG_FEATURE_HUMAN_READABLE
# define LS_STR_HUMAN_READABLE "h"
#else
# define LS_STR_HUMAN_READABLE ""
#endif
#ifdef CONFIG_SELINUX
# define LS_STR_SELINUX "K"
#else
# define LS_STR_SELINUX ""
#endif
#ifdef CONFIG_FEATURE_AUTOWIDTH
# define LS_STR_AUTOWIDTH "T:w:"
#else
# define LS_STR_AUTOWIDTH ""
#endif
static const char ls_options[]="Cadil1gnsxAk" \
LS_STR_TIMESTAMPS \
USE_FEATURE_LS_SORTFILES("SXrv") \
LS_STR_FILETYPES \
LS_STR_FOLLOW_LINKS \
LS_STR_RECURSIVE \
LS_STR_HUMAN_READABLE \
LS_STR_SELINUX \
LS_STR_AUTOWIDTH;
#define LIST_MASK_TRIGGER 0 #define LIST_MASK_TRIGGER 0
#define STYLE_MASK_TRIGGER STYLE_MASK #define STYLE_MASK_TRIGGER STYLE_MASK
@ -817,52 +749,52 @@ static const char ls_options[]="Cadil1gnsxAk" \
#define DISP_MASK_TRIGGER DISP_ROWS #define DISP_MASK_TRIGGER DISP_ROWS
static const unsigned opt_flags[] = { static const unsigned opt_flags[] = {
LIST_SHORT | STYLE_COLUMNS, /* C */ LIST_SHORT | STYLE_COLUMNS, /* C */
DISP_HIDDEN | DISP_DOT, /* a */ DISP_HIDDEN | DISP_DOT, /* a */
DISP_NOLIST, /* d */ DISP_NOLIST, /* d */
LIST_INO, /* i */ LIST_INO, /* i */
LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */
LIST_SHORT | STYLE_SINGLE, /* 1 */ LIST_SHORT | STYLE_SINGLE, /* 1 */
0, /* g - ingored */ 0, /* g - ingored */
LIST_ID_NUMERIC, /* n */ LIST_ID_NUMERIC, /* n */
LIST_BLOCKS, /* s */ LIST_BLOCKS, /* s */
DISP_ROWS, /* x */ DISP_ROWS, /* x */
DISP_HIDDEN, /* A */ DISP_HIDDEN, /* A */
#ifdef CONFIG_SELINUX #if ENABLE_SELINUX
LIST_CONTEXT, /* k */ LIST_CONTEXT, /* k */
#else #else
0, /* k - ingored */ 0, /* k - ingored */
#endif #endif
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */ TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */
LIST_FULLTIME, /* e */ LIST_FULLTIME, /* e */
ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */ ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */
TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */ TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */
#endif #endif
#ifdef CONFIG_FEATURE_LS_SORTFILES #if ENABLE_FEATURE_LS_SORTFILES
SORT_SIZE, /* S */ SORT_SIZE, /* S */
SORT_EXT, /* X */ SORT_EXT, /* X */
SORT_ORDER_REVERSE, /* r */ SORT_ORDER_REVERSE, /* r */
SORT_VERSION, /* v */ SORT_VERSION, /* v */
#endif #endif
#ifdef CONFIG_FEATURE_LS_FILETYPES #if ENABLE_FEATURE_LS_FILETYPES
LIST_FILETYPE | LIST_EXEC, /* F */ LIST_FILETYPE | LIST_EXEC, /* F */
LIST_FILETYPE, /* p */ LIST_FILETYPE, /* p */
#endif #endif
#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS #if ENABLE_FEATURE_LS_FOLLOWLINKS
FOLLOW_LINKS, /* L */ FOLLOW_LINKS, /* L */
#endif #endif
#ifdef CONFIG_FEATURE_LS_RECURSIVE #if ENABLE_FEATURE_LS_RECURSIVE
DISP_RECURSIVE, /* R */ DISP_RECURSIVE, /* R */
#endif #endif
#ifdef CONFIG_FEATURE_HUMAN_READABLE #if ENABLE_FEATURE_HUMAN_READABLE
LS_DISP_HR, /* h */ LS_DISP_HR, /* h */
#endif #endif
#ifdef CONFIG_SELINUX #if ENABLE_SELINUX
LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
#endif #endif
#ifdef CONFIG_FEATURE_AUTOWIDTH #if ENABLE_FEATURE_AUTOWIDTH
0, 0, /* T, w - ignored */ 0, 0, /* T, w - ignored */
#endif #endif
(1U<<31) (1U<<31)
}; };
@ -885,110 +817,89 @@ int ls_main(int argc, char **argv)
int ac; int ac;
int i; int i;
char **av; char **av;
#ifdef CONFIG_FEATURE_AUTOWIDTH #if ENABLE_FEATURE_AUTOWIDTH
char *tabstops_str = NULL; char *tabstops_str = NULL;
char *terminal_width_str = NULL; char *terminal_width_str = NULL;
#endif #endif
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
char *color_opt; char *color_opt;
#endif #endif
all_fmt = LIST_SHORT | all_fmt = LIST_SHORT |
(ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_ORDER_FORWARD)); (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_ORDER_FORWARD));
#ifdef CONFIG_FEATURE_AUTOWIDTH #if ENABLE_FEATURE_AUTOWIDTH
/* Obtain the terminal width. */ /* Obtain the terminal width. */
get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL); get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL);
/* Go one less... */ /* Go one less... */
terminal_width--; terminal_width--;
#endif #endif
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
applet_long_options = ls_color_opt; applet_long_options = ls_color_opt;
#endif #endif
/* process options */ /* process options */
#ifdef CONFIG_FEATURE_AUTOWIDTH #if ENABLE_FEATURE_AUTOWIDTH
opt = getopt32(argc, argv, ls_options, &tabstops_str, &terminal_width_str opt = getopt32(argc, argv, ls_options, &tabstops_str, &terminal_width_str
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
, &color_opt , &color_opt
#endif #endif
); );
if (tabstops_str) { if (tabstops_str)
tabstops = xatou(tabstops_str); tabstops = xatou(tabstops_str);
} if (terminal_width_str)
if (terminal_width_str) {
terminal_width = xatou(terminal_width_str); terminal_width = xatou(terminal_width_str);
}
#else #else
opt = getopt32(argc, argv, ls_options opt = getopt32(argc, argv, ls_options
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
, &color_opt , &color_opt
#endif #endif
); );
#endif #endif
for (i = 0; opt_flags[i] != (1U<<31); i++) { for (i = 0; opt_flags[i] != (1U<<31); i++) {
if (opt & (1 << i)) { if (opt & (1 << i)) {
unsigned int flags = opt_flags[i]; unsigned flags = opt_flags[i];
if (flags & LIST_MASK_TRIGGER) { if (flags & LIST_MASK_TRIGGER)
all_fmt &= ~LIST_MASK; all_fmt &= ~LIST_MASK;
} if (flags & STYLE_MASK_TRIGGER)
if (flags & STYLE_MASK_TRIGGER) {
all_fmt &= ~STYLE_MASK; all_fmt &= ~STYLE_MASK;
} if (ENABLE_FEATURE_LS_SORTFILES && (flags & SORT_MASK_TRIGGER))
if (ENABLE_FEATURE_LS_SORTFILES && (flags & SORT_MASK_TRIGGER)) {
all_fmt &= ~SORT_MASK; all_fmt &= ~SORT_MASK;
} if (flags & DISP_MASK_TRIGGER)
if (flags & DISP_MASK_TRIGGER) {
all_fmt &= ~DISP_MASK; all_fmt &= ~DISP_MASK;
} if (flags & TIME_MASK)
if (flags & TIME_MASK) {
all_fmt &= ~TIME_MASK; all_fmt &= ~TIME_MASK;
} if (flags & LIST_CONTEXT)
if (flags & LIST_CONTEXT) {
all_fmt |= STYLE_SINGLE; all_fmt |= STYLE_SINGLE;
} if (ENABLE_FEATURE_HUMAN_READABLE && opt == 'l')
#ifdef CONFIG_FEATURE_HUMAN_READABLE
if (opt == 'l') {
all_fmt &= ~LS_DISP_HR; all_fmt &= ~LS_DISP_HR;
}
#endif
all_fmt |= flags; all_fmt |= flags;
} }
} }
#ifdef CONFIG_FEATURE_LS_COLOR #if ENABLE_FEATURE_LS_COLOR
{ /* find color bit value - last position for short getopt */
/* find color bit value - last position for short getopt */ if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) {
char *p = getenv("LS_COLORS");
#if CONFIG_FEATURE_LS_COLOR_IS_DEFAULT /* LS_COLORS is unset, or (not empty && not "none") ? */
char *p; if (!p || (p[0] && strcmp(p, "none")))
show_color = 1;
if ((p = getenv ("LS_COLORS")) != NULL && }
(*p == '\0' || (strcmp(p, "none") == 0))) { if (opt & (1 << i)) { /* next flag after short options */
; if (!color_opt || !strcmp("always", color_opt))
} else if (isatty(STDOUT_FILENO)) { show_color = 1;
else if (color_opt && !strcmp("never", color_opt))
show_color = 0;
else if (color_opt && !strcmp("auto", color_opt) && isatty(STDOUT_FILENO))
show_color = 1; show_color = 1;
}
#endif
if((opt & (1 << i))) { /* next flag after short options */
if (color_opt == NULL || strcmp("always", color_opt) == 0)
show_color = 1;
else if (color_opt != NULL && strcmp("never", color_opt) == 0)
show_color = 0;
else if (color_opt != NULL && strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
show_color = 1;
}
} }
#endif #endif
/* sort out which command line options take precedence */ /* sort out which command line options take precedence */
#ifdef CONFIG_FEATURE_LS_RECURSIVE if (ENABLE_FEATURE_LS_RECURSIVE && (all_fmt & DISP_NOLIST))
if (all_fmt & DISP_NOLIST)
all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */ all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */
#endif
if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) { if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) {
if (all_fmt & TIME_CHANGE) if (all_fmt & TIME_CHANGE)
all_fmt = (all_fmt & ~SORT_MASK) | SORT_CTIME; all_fmt = (all_fmt & ~SORT_MASK) | SORT_CTIME;
@ -997,10 +908,9 @@ int ls_main(int argc, char **argv)
} }
if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */ if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */
all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC); all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC);
#ifdef CONFIG_FEATURE_LS_USERNAME if (ENABLE_FEATURE_LS_USERNAME)
if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC)) if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */ all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */
#endif
/* choose a display format */ /* choose a display format */
if (!(all_fmt & STYLE_MASK)) if (!(all_fmt & STYLE_MASK))
@ -1015,7 +925,7 @@ int ls_main(int argc, char **argv)
*/ */
ac = argc - optind; /* how many cmd line args are left */ ac = argc - optind; /* how many cmd line args are left */
if (ac < 1) { if (ac < 1) {
static const char * const dotdir[] = { "." }; static const char *const dotdir[] = { "." };
av = (char **) dotdir; av = (char **) dotdir;
ac = 1; ac = 1;
@ -1027,7 +937,7 @@ int ls_main(int argc, char **argv)
if (ac > 1) if (ac > 1)
all_fmt |= DISP_DIRNAME; /* 2 or more items? label directories */ all_fmt |= DISP_DIRNAME; /* 2 or more items? label directories */
/* stuff the command line file names into an dnode array */ /* stuff the command line file names into a dnode array */
dn = NULL; dn = NULL;
for (oi = 0; oi < ac; oi++) { for (oi = 0; oi < ac; oi++) {
cur = my_stat(av[oi], av[oi]); cur = my_stat(av[oi], av[oi]);
@ -1040,8 +950,8 @@ int ls_main(int argc, char **argv)
} }
/* 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
*/ */
dnp = dnalloc(nfiles); dnp = dnalloc(nfiles);
for (i = 0, cur = dn; i < nfiles; i++) { for (i = 0, cur = dn; i < nfiles; i++) {
dnp[i] = cur; /* save pointer to node in array */ dnp[i] = cur; /* save pointer to node in array */
@ -1072,5 +982,5 @@ int ls_main(int argc, char **argv)
} }
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
dfree(dnp, nfiles); dfree(dnp, nfiles);
return (status); return status;
} }

8
include/libbb.h
View File

@ -89,13 +89,13 @@
# define STRTOOFF strtol # define STRTOOFF strtol
# define SAFE_STRTOOFF safe_strtol # define SAFE_STRTOOFF safe_strtol
# define XSTRTOUOFF xstrtoul # define XSTRTOUOFF xstrtoul
# define OFF_FMT "%ld" # define OFF_FMT "ld"
# else # else
/* "long" is too short, need "long long" */ /* "long" is too short, need "long long" */
# define STRTOOFF strtoll # define STRTOOFF strtoll
# define SAFE_STRTOOFF safe_strtoll # define SAFE_STRTOOFF safe_strtoll
# define XSTRTOUOFF xstrtoull # define XSTRTOUOFF xstrtoull
# define OFF_FMT "%lld" # define OFF_FMT "lld"
# endif # endif
#else #else
# if 0 /* #if UINT_MAX == 0xffffffff */ # if 0 /* #if UINT_MAX == 0xffffffff */
@ -104,12 +104,12 @@
# define STRTOOFF strtol # define STRTOOFF strtol
# define SAFE_STRTOOFF safe_strtoi # define SAFE_STRTOOFF safe_strtoi
# define XSTRTOUOFF xstrtou # define XSTRTOUOFF xstrtou
# define OFF_FMT "%d" # define OFF_FMT "d"
# else # else
# define STRTOOFF strtol # define STRTOOFF strtol
# define SAFE_STRTOOFF safe_strtol # define SAFE_STRTOOFF safe_strtol
# define XSTRTOUOFF xstrtoul # define XSTRTOUOFF xstrtoul
# define OFF_FMT "%ld" # define OFF_FMT "ld"
# endif # endif
#endif #endif
/* scary. better ideas? (but do *test* them first!) */ /* scary. better ideas? (but do *test* them first!) */

2
libbb/concat_path_file.c
View File

@ -9,7 +9,7 @@
*/ */
/* concatenate path and file name to new allocation buffer, /* concatenate path and file name to new allocation buffer,
* not addition '/' if path name already have '/' * not adding '/' if path name already has '/'
*/ */
#include "libbb.h" #include "libbb.h"

2
networking/ftpgetput.c
View File

@ -149,7 +149,7 @@ int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
} }
if (do_continue) { if (do_continue) {
sprintf(buf, "REST "OFF_FMT, beg_range); sprintf(buf, "REST %"OFF_FMT, beg_range);
if (ftpcmd(buf, NULL, control_stream, buf) != 350) { if (ftpcmd(buf, NULL, control_stream, buf) != 350) {
do_continue = 0; do_continue = 0;
} else { } else {

2
networking/httpd.c
View File

@ -919,7 +919,7 @@ static int sendHeaders(HttpResponseNum responseNum)
if (config->ContentLength != -1) { /* file */ if (config->ContentLength != -1) { /* file */
strftime(timeStr, sizeof(timeStr), RFC1123FMT, gmtime(&config->last_mod)); strftime(timeStr, sizeof(timeStr), RFC1123FMT, gmtime(&config->last_mod));
len += sprintf(buf+len, "Last-Modified: %s\r\n%s "OFF_FMT"\r\n", len += sprintf(buf+len, "Last-Modified: %s\r\n%s %"OFF_FMT"\r\n",
timeStr, Content_length, (off_t) config->ContentLength); timeStr, Content_length, (off_t) config->ContentLength);
} }
strcat(buf, "\r\n"); strcat(buf, "\r\n");

4
networking/wget.c
View File

@ -286,7 +286,7 @@ int wget_main(int argc, char **argv)
#endif #endif
if (beg_range) if (beg_range)
fprintf(sfp, "Range: bytes="OFF_FMT"-\r\n", beg_range); fprintf(sfp, "Range: bytes=%"OFF_FMT"-\r\n", beg_range);
#if ENABLE_FEATURE_WGET_LONG_OPTIONS #if ENABLE_FEATURE_WGET_LONG_OPTIONS
if (extra_headers) if (extra_headers)
fputs(extra_headers, sfp); fputs(extra_headers, sfp);
@ -427,7 +427,7 @@ int wget_main(int argc, char **argv)
dfp = open_socket(&s_in); dfp = open_socket(&s_in);
if (beg_range) { if (beg_range) {
sprintf(buf, "REST "OFF_FMT, beg_range); sprintf(buf, "REST %"OFF_FMT, beg_range);
if (ftpcmd(buf, NULL, sfp, buf) == 350) if (ftpcmd(buf, NULL, sfp, buf) == 350)
content_len -= beg_range; content_len -= beg_range;
} }

2
util-linux/fdisk.c
View File

@ -2277,7 +2277,7 @@ add_partition(int n, int sys)
if (start > limit) if (start > limit)
break; break;
if (start >= temp+units_per_sector && num_read) { if (start >= temp+units_per_sector && num_read) {
printf(_("Sector "OFF_FMT" is already allocated\n"), temp); printf(_("Sector %"OFF_FMT" is already allocated\n"), temp);
temp = start; temp = start;
num_read = 0; num_read = 0;
} }