fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup ls

Browse Source
This commit is contained in:
Connor Lane Smith 2011-05-26 04:12:49 +01:00
parent 6ef3d9174b
commit 8be2afd2c3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ls.c
View File

@ -23,12 +23,13 @@ typedef struct {
} Entry; } Entry;
static int entcmp(Entry *, Entry *); static int entcmp(Entry *, Entry *);
static void ls(char *, bool); static void ls(char *);
static void lsdir(const char *); static void lsdir(const char *);
static void mkent(Entry *, char *); static void mkent(Entry *, char *);
static void output(Entry *); static void output(Entry *);
static bool aflag = false; static bool aflag = false;
static bool dflag = false;
static bool lflag = false; static bool lflag = false;
static bool tflag = false; static bool tflag = false;
static bool many; static bool many;
@ -36,7 +37,6 @@ static bool many;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
bool dflag = false;
char c; char c;
while((c = getopt(argc, argv, "adlt")) != -1) while((c = getopt(argc, argv, "adlt")) != -1)
@ -59,9 +59,9 @@ main(int argc, char *argv[])
many = (argc > optind+1); many = (argc > optind+1);
if(optind == argc) if(optind == argc)
ls(".", !dflag); ls(".");
else for(; optind < argc; optind++) else for(; optind < argc; optind++)
ls(argv[optind], !dflag); ls(argv[optind]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
@ -75,12 +75,12 @@ entcmp(Entry *a, Entry *b)
} }
void void
ls(char *path, bool expand) ls(char *path)
{ {
Entry ent; Entry ent;
mkent(&ent, path); mkent(&ent, path);
if(expand && S_ISDIR(ent.mode)) if(S_ISDIR(ent.mode) && !dflag)
lsdir(path); lsdir(path);
else else
output(&ent); output(&ent);
@ -208,5 +208,6 @@ output(Entry *ent)
fmt = "%b %d %H:%M"; fmt = "%b %d %H:%M";
strftime(buf, sizeof buf, fmt, localtime(&ent->mtime)); strftime(buf, sizeof buf, fmt, localtime(&ent->mtime));
printf("%s %2d %s %s %6lu %s %s\n", mode, ent->nlink, pw->pw_name, gr->gr_name, (unsigned long)ent->size, buf, ent->name); printf("%s %2d %s %s %6lu %s %s\n", mode, ent->nlink, pw->pw_name,
gr->gr_name, (unsigned long)ent->size, buf, ent->name);
} }