-/*
- * Mini ls implementation for busybox
- *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#if fooBar
-
-#include <stdio.h>
-#include <unistd.h>
-#include <dirent.h>
-#include "internal.h"
-
-
-static const char ls_usage[] = "ls [OPTION]... [FILE]...\n"
-"List information about the FILEs (the current directory by default).\n";
-
-int oneFlag=FALSE;
-int allFlag=FALSE;
-int directoryFlag=FALSE;
-int longFlag=FALSE;
-int typeFlag=FALSE;
-int dereferenceFlag=FALSE;
-int recursiveFlag=FALSE;
-
-static int fileAction(const char *fileName)
-{
- if ( allFlag==FALSE && ((strcmp(fileName, "..") == 0)
- || (strcmp(fileName, ".") == 0)) ) {
- return( TRUE);
- }
- //struct stat statBuf;
- //if (stat(fileName, &statBuf) > 0) {
- fprintf(stdout, "%s\n", fileName);
- return( TRUE);
- //}
- //else {
-// perror(fileName);
-// return( FALSE);
-// }
-}
-
-static int dirAction(const char *fileName)
-{
- DIR *dir;
- struct dirent *entry;
-
- fprintf(stdout, "%s\n", fileName);
-
- dir = opendir( fileName);
- if (!dir) {
- perror("Can't open directory");
- exit(FALSE);
- }
- while ((entry = readdir(dir)) != NULL) {
- recursiveAction( entry->d_name, recursiveFlag, dereferenceFlag, fileAction, dirAction);
- }
- return( TRUE);
-}
-
-int ls_main(int argc, char **argv)
-{
- if (argc <= 1) {
- char buf[NAME_MAX];
- getcwd( buf, NAME_MAX);
- dirAction( buf);
- }
-
- /* peel of the "ls" */
- argc--;
- argv++;
-
- /* Parse any options */
- while (**argv == '-') {
- while (*++(*argv)) switch (**argv) {
- case '1':
- oneFlag = TRUE;
- break;
- case 'a':
- allFlag = TRUE;
- break;
- case 'd':
- directoryFlag = TRUE;
- break;
- case 'l':
- longFlag = TRUE;
- break;
- case 'F':
- typeFlag = TRUE;
- break;
- case 'L':
- dereferenceFlag = TRUE;
- break;
- case 'R':
- recursiveFlag = TRUE;
- break;
- default:
- fprintf(stderr, "Usage: %s\n", ls_usage);
- exit( FALSE);
- }
- argc--;
- argv++;
- }
-
- /* Ok, ready to do the deed now */
- fprintf(stderr, "B\n");
- while (argc-- > 1) {
- fprintf(stderr, "C\n");
- recursiveAction( *argv, recursiveFlag, dereferenceFlag, fileAction, dirAction);
- }
- exit(TRUE);
-}
-
-
-
-#else
-
-
-#include "internal.h"
/*
* tiny-ls.c version 0.1.0: A minimalist 'ls'
* Copyright (C) 1996 Brian Candler <B.Candler@pobox.com>
* 1. requires lstat (BSD) - how do you do it without?
*/
-#define FEATURE_USERNAME /* show username/groupnames (libc6 uses NSS) */
-#define FEATURE_TIMESTAMPS /* show file timestamps */
-#define FEATURE_AUTOWIDTH /* calculate terminal & column widths */
-#define FEATURE_FILETYPECHAR /* enable -p and -F */
-
-#undef OP_BUF_SIZE 1024 /* leave undefined for unbuffered output */
-
#define TERMINAL_WIDTH 80 /* use 79 if your terminal has linefold bug */
#define COLUMN_WIDTH 14 /* default if AUTOWIDTH not defined */
#define COLUMN_GAP 2 /* includes the file type char, if present */
+#define HAS_REWINDDIR
/************************************************************************/
-#define HAS_REWINDDIR
-
-#if 1 /* FIXME libc 6 */
+#include "internal.h"
+#if !defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
# include <linux/types.h>
#else
# include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
-#ifdef FEATURE_USERNAME
-#include <pwd.h>
-#include <grp.h>
-#endif
-#ifdef FEATURE_TIMESTAMPS
+#ifdef BB_FEATURE_LS_TIMESTAMPS
#include <time.h>
#endif
#define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
#define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)])
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
#define APPCHAR(mode) ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)])
#endif
#define MINOR(dev) ((dev)&0xff)
#endif
-#define MODE1 "rwxrwxrwx"
-#define MODE0 "---------"
-#define SMODE1 "..s..s..t"
-#define SMODE0 "..S..S..T"
-
-/* The 9 mode bits to test */
-
-static const umode_t MBIT[] = {
- S_IRUSR, S_IWUSR, S_IXUSR,
- S_IRGRP, S_IWGRP, S_IXGRP,
- S_IROTH, S_IWOTH, S_IXOTH
-};
-
-/* The special bits. If set, display SMODE0/1 instead of MODE0/1 */
-
-static const umode_t SBIT[] = {
- 0, 0, S_ISUID,
- 0, 0, S_ISGID,
- 0, 0, S_ISVTX
-};
-
#define FMT_AUTO 0
#define FMT_LONG 1 /* one record per line, extended info */
#define FMT_SINGLE 2 /* one record per line */
static unsigned short opts = 0;
static unsigned short column = 0;
-#ifdef FEATURE_AUTOWIDTH
+#ifdef BB_FEATURE_AUTOWIDTH
static unsigned short terminal_width = 0, column_width = 0;
#else
#define terminal_width TERMINAL_WIDTH
#define column_width COLUMN_WIDTH
#endif
-#ifdef FEATURE_TIMESTAMPS
+#ifdef BB_FEATURE_LS_TIMESTAMPS
static unsigned char time_fmt = TIME_MOD;
#endif
static void writenum(long val, short minwidth)
{
- char scratch[20];
+ char scratch[128];
char *p = scratch + sizeof(scratch);
short len = 0;
#undef nspaces
}
-#ifdef FEATURE_FILETYPECHAR
-static char append_char(umode_t mode)
+#ifdef BB_FEATURE_LS_FILETYPES
+static char append_char(mode_t mode)
{
if (!(opts & DISP_FTYPE))
return '\0';
**
**/
-static void list_single(const char *name, struct stat *info)
+static void list_single(const char *name, struct stat *info, const char *fullname)
{
- char scratch[20];
+ char scratch[PATH_MAX];
short len = strlen(name);
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
char append = append_char(info->st_mode);
#endif
if (display_fmt == FMT_LONG) {
- umode_t mode = info->st_mode;
- int i;
-
- scratch[0] = TYPECHAR(mode);
- for (i=0; i<9; i++)
- if (mode & SBIT[i])
- scratch[i+1] = (mode & MBIT[i])
- ? SMODE1[i]
- : SMODE0[i];
- else
- scratch[i+1] = (mode & MBIT[i])
- ? MODE1[i]
- : MODE0[i];
+ mode_t mode = info->st_mode;
newline();
- wr(scratch, 10);
+ wr(modeString(mode), 10);
column=10;
- writenum((long)info->st_nlink,(short)4);
+ writenum((long)info->st_nlink,(short)5);
fputs(" ", stdout);
-#ifdef FEATURE_USERNAME
+#ifdef BB_FEATURE_LS_USERNAME
if (!(opts & DISP_NUMERIC)) {
- struct passwd *pw = getpwuid(info->st_uid);
- if (pw)
- fputs(pw->pw_name, stdout);
- else
- writenum((long)info->st_uid,(short)0);
+ memset ( scratch, 0, sizeof (scratch));
+ my_getpwuid( scratch, info->st_uid);
+ if (*scratch) {
+ fputs(scratch, stdout);
+ if ( strlen( scratch) <= 8 )
+ wr(" ", 8-strlen( scratch));
+ }
+ else {
+ writenum((long) info->st_uid,(short)8);
+ fputs(" ", stdout);
+ }
} else
#endif
- writenum((long)info->st_uid,(short)0);
- tab(24);
-#ifdef FEATURE_USERNAME
+ {
+ writenum((long) info->st_uid,(short)8);
+ fputs(" ", stdout);
+ }
+#ifdef BB_FEATURE_LS_USERNAME
if (!(opts & DISP_NUMERIC)) {
- struct group *gr = getgrgid(info->st_gid);
- if (gr)
- fputs(gr->gr_name, stdout);
- else
- writenum((long)info->st_gid,(short)0);
+ memset ( scratch, 0, sizeof (scratch));
+ my_getgrgid( scratch, info->st_gid);
+ if (*scratch) {
+ fputs(scratch, stdout);
+ if ( strlen( scratch) <= 8 )
+ wr(" ", 8-strlen( scratch));
+ }
+ else
+ writenum((long) info->st_gid,(short)8);
} else
#endif
- writenum((long)info->st_gid,(short)0);
- tab(33);
+ writenum((long) info->st_gid,(short)8);
+ //tab(26);
if (S_ISBLK(mode) || S_ISCHR(mode)) {
writenum((long)MAJOR(info->st_rdev),(short)3);
fputs(", ", stdout);
else
writenum((long)info->st_size,(short)8);
fputs(" ", stdout);
-#ifdef FEATURE_TIMESTAMPS
+ //tab(32);
+#ifdef BB_FEATURE_LS_TIMESTAMPS
{
time_t cal;
char *string;
wr(name, len);
if (S_ISLNK(mode)) {
wr(" -> ", 4);
- len = readlink(name, scratch, sizeof scratch);
+ len = readlink(fullname, scratch, sizeof scratch);
if (len > 0) fwrite(scratch, 1, len, stdout);
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
/* show type of destination */
if (opts & DISP_FTYPE) {
- if (!stat(name, info)) {
+ if (!stat(fullname, info)) {
append = append_char(info->st_mode);
if (append)
fputc(append, stdout);
}
#endif
}
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
else if (append)
wr(&append, 1);
#endif
newline();
else {
if (nexttab + column_width > terminal_width
-#ifndef FEATURE_AUTOWIDTH
+#ifndef BB_FEATURE_AUTOWIDTH
|| nexttab + len >= terminal_width
#endif
)
tab(nexttab);
}
/* work out where next column starts */
-#ifdef FEATURE_AUTOWIDTH
+#ifdef BB_FEATURE_AUTOWIDTH
/* we know the calculated width is big enough */
nexttab = column + column_width + COLUMN_GAP;
#else
/* now write the data */
wr(name, len);
column = column + len;
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
if (append)
wr(&append, 1), column++;
#endif
if (!S_ISDIR(info.st_mode) ||
(opts & DIR_NOLIST)) {
- list_single(name, &info);
+ list_single(name, &info, name);
return 0;
}
dir = opendir(name);
if (!dir) goto listerr;
-#ifdef FEATURE_AUTOWIDTH
+#ifdef BB_FEATURE_AUTOWIDTH
column_width = 0;
while ((entry = readdir(dir)) != NULL) {
short w = strlen(entry->d_name);
strcpy(fnend, entry->d_name);
if (lstat(fullname, &info))
goto direrr; /* (shouldn't fail) */
- list_single(entry->d_name, &info);
+ list_single(entry->d_name, &info, fullname);
}
closedir(dir);
return 0;
return 1;
}
-const char ls_usage[] = "Usage: ls [-1a"
-#ifdef FEATURE_TIMESTAMPS
+static const char ls_usage[] = "ls [-1a"
+#ifdef BB_FEATURE_LS_TIMESTAMPS
"c"
#endif
"d"
-#ifdef FEATURE_TIMESTAMPS
+#ifdef BB_FEATURE_LS_TIMESTAMPS
"e"
#endif
"ln"
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
"p"
#endif
-#ifdef FEATURE_TIMESTAMPS
+#ifdef BB_FEATURE_LS_TIMESTAMPS
"u"
#endif
"xAC"
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
"F"
#endif
#ifdef FEATURE_RECURSIVE
case '1': display_fmt = FMT_SINGLE; break;
case 'x': display_fmt = FMT_ROWS; break;
case 'C': display_fmt = FMT_COLUMNS; break;
-#ifdef FEATURE_FILETYPECHAR
+#ifdef BB_FEATURE_LS_FILETYPES
case 'p': opts |= DISP_FTYPE; break;
case 'F': opts |= DISP_FTYPE|DISP_EXEC; break;
#endif
#ifdef FEATURE_RECURSIVE
case 'R': opts |= DIR_RECURSE; break;
#endif
-#ifdef FEATURE_TIMESTAMPS
+#ifdef BB_FEATURE_LS_TIMESTAMPS
case 'u': time_fmt = TIME_ACCESS; break;
case 'c': time_fmt = TIME_CHANGE; break;
case 'e': opts |= DISP_FULLTIME; break;
/* choose a display format */
if (display_fmt == FMT_AUTO)
- display_fmt = isatty(STDOUT_FILENO) ? FMT_COLUMNS : FMT_SINGLE;
+ display_fmt = isatty(fileno(stdout)) ? FMT_COLUMNS : FMT_SINGLE;
if (argi < argc - 1)
opts |= DISP_DIRNAME; /* 2 or more items? label directories */
-#ifdef FEATURE_AUTOWIDTH
+#ifdef BB_FEATURE_AUTOWIDTH
/* could add a -w option and/or TIOCGWINSZ call */
if (terminal_width < 1) terminal_width = TERMINAL_WIDTH;
exit( i);
print_usage_message:
- fprintf(stderr, "Usage: %s\n", ls_usage);
+ usage (ls_usage);
exit( FALSE);
}
-#endif
projects / oweals / busybox.git / blobdiff