yggdrasil-old/kernel
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detailed ls

Browse Source
This commit is contained in:
Mark
2020-01-05 16:06:30 +02:00
parent aca450c99f
commit 08d7392046
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/notes.txt
+2
View File
@@ -0,0 +1,2 @@
TODO: Rewrite thread_init, it's shit
TODO: execve() after fork() should inherit old thread's ioctx
usr/core/bin/ls.c
+56
View File
@@ -1,3 +1,4 @@
#include <sys/stat.h>
#include <dirent.h>
#include <string.h>
#include <unistd.h>
@@ -5,6 +6,7 @@
#include <stdio.h>
#define LS_COLOR (1 << 0)
#define LS_DETAIL (1 << 1)
#define COLOR_DIR "\033[36m"
#define COLOR_DEV "\033[33m"
@@ -16,6 +18,9 @@ static int ls_dir(const char *path, int flags) {
int res;
DIR *dir;
struct dirent *ent;
struct stat ent_stat;
char ent_path[512];
char t;
if (!(dir = opendir(path))) {
perror(path);
@@ -24,6 +29,49 @@ static int ls_dir(const char *path, int flags) {
while ((ent = readdir(dir))) {
if (ent->d_name[0] != '.') {
if (flags & LS_DETAIL) {
snprintf(ent_path, sizeof(ent_path), "%s/%s",
strcmp(path, "") ? path : ".", ent->d_name);
if (stat(ent_path, &ent_stat) != 0) {
printf("?????????? ? ? ? ");
} else {
switch (ent_stat.st_mode & S_IFMT) {
case S_IFDIR:
t = 'd';
break;
case S_IFREG:
t = '-';
break;
case S_IFBLK:
t = 'b';
break;
case S_IFCHR:
t = 'c';
break;
default:
t = '?';
break;
}
printf("%c%c%c%c%c%c%c%c%c%c ",
t,
(ent_stat.st_mode & S_IRUSR) ? 'r' : '-',
(ent_stat.st_mode & S_IWUSR) ? 'w' : '-',
(ent_stat.st_mode & S_IXUSR) ? 'x' : '-',
(ent_stat.st_mode & S_IRGRP) ? 'r' : '-',
(ent_stat.st_mode & S_IWGRP) ? 'w' : '-',
(ent_stat.st_mode & S_IXGRP) ? 'x' : '-',
(ent_stat.st_mode & S_IROTH) ? 'r' : '-',
(ent_stat.st_mode & S_IWOTH) ? 'w' : '-',
(ent_stat.st_mode & S_IXOTH) ? 'x' : '-');
printf("%4u %4u %8u ",
ent_stat.st_gid,
ent_stat.st_uid,
ent_stat.st_blocks);
}
}
if (flags & LS_COLOR) {
switch (ent->d_type) {
case DT_REG:
@@ -61,9 +109,14 @@ int main(int argc, char **argv) {
for (int i = 1; i < argc; ++i) {
if (argv[i][0] != '-') {
first = i;
break;
} else {
if (!strcmp(argv[i], "-c")) {
flags |= LS_COLOR;
} else if (!strcmp(argv[i], "-d")) {
flags |= LS_DETAIL;
} else {
printf("Unknown option: %s\n", argv[i]);
}
}
}
@@ -72,6 +125,9 @@ int main(int argc, char **argv) {
ls_dir("", flags);
} else {
for (int i = first; i < argc; ++i) {
if (first != argc - 1) {
printf("%s:\n", argv[i]);
}
ls_dir(argv[i], flags);
}
}