summaryrefslogtreecommitdiff
path: root/src/commands/ls.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands/ls.c')
-rw-r--r--src/commands/ls.c184
1 files changed, 132 insertions, 52 deletions
diff --git a/src/commands/ls.c b/src/commands/ls.c
index b0b00a5..8d64f74 100644
--- a/src/commands/ls.c
+++ b/src/commands/ls.c
@@ -12,12 +12,14 @@
#include <ftw.h>
#include <limits.h>
-#define FILE_COLOR "\x1b[0m"
-#define DIR_COLOR "\x1b[1;34m"
-#define SET_UID_COLOR "\x1b[41m"
-#define SET_GID_COLOR "\x1b[43m"
-#define EXEC_COLOR "\x1b[1;92m"
-#define LINK_COLOR "\x1b[1;96m"
+#define FILE_COLOR ANSCII BLACK COLOR
+#define DIR_COLOR ANSCII BOLD NEXT NORMAL BLUE COLOR
+#define DIR_COLOR_EXEC ANSCII BACKGROUND GREEN NEXT NORMAL BLACK COLOR
+#define LINK_COLOR ANSCII BOLD NEXT HIGHLIGHT TURQUOISE COLOR
+#define SET_UID_COLOR ANSCII BACKGROUND RED NEXT NORMAL WHITE COLOR
+#define SET_GID_COLOR ANSCII BACKGROUND YELLOW NEXT NORMAL BLACK COLOR
+#define EXEC_COLOR ANSCII BOLD NEXT NORMAL GREEN COLOR
+#define BLK_COLOR ANSCII BOLD NEXT NORMAL YELLOW COLOR
struct Flags {
bool hidden;
@@ -25,17 +27,17 @@ struct Flags {
bool more_info;
bool one_column;
bool recurse;
- bool colored;
+ enum When colored;
};
struct FileInfo {
- char mode[11];
- int links;
struct passwd* usr;
struct group* grp;
- char size[5];
- char date[13];
char name[PATH_MAX];
+ char date[13];
+ char mode[11];
+ char size[5];
+ int links;
bool set_uid;
bool set_gid;
bool exec;
@@ -76,34 +78,59 @@ static void append_path(char buf[PATH_MAX], const char* dir_path, const char* fi
buf[dir_len + file_len] = '\0';
}
-static bool get_file_info(struct dirent* file, const char* dir_path, struct FileInfo* info) {
+static bool get_file_info(const char* file_path, const char* dir_path, struct FileInfo* info) {
uid_t uid = getuid();
gid_t gid = getgid();
char buf[PATH_MAX];
- append_path(buf, dir_path, file->d_name);
+ append_path(buf, dir_path, file_path);
struct stat s;
memset(&s, 0, sizeof(struct stat));
- if (stat(buf, &s) < 0) {
- // printf("\x1b[0merror: failed to read file '%s': %s\n", buf, strerror(errno));
+ if (lstat(buf, &s) < 0) {
+ printf("\x1b[0merror: failed to read file '%s': %s\n", buf, strerror(errno));
return false;
}
-
+
+ int ty = (s.st_mode & S_IFMT) >> 12;
+
info->set_uid = false;
info->set_gid = false;
info->exec = false;
info->name[0] = '\0';
- if (file->d_type == DT_DIR)
- info->mode[0] = 'd';
- else if (file->d_type == DT_LNK)
- info->mode[0] = 'l';
- else
- info->mode[0] = '-';
-
+ switch (ty) {
+ case DT_BLK:
+ info->mode[0] = 'b';
+ break;
+ case DT_CHR:
+ info->mode[0] = 'c';
+ break;
+ case DT_DIR:
+ info->mode[0] = 'd';
+ break;
+ case DT_FIFO:
+ info->mode[0] = 'f';
+ break;
+ case DT_LNK:
+ info->mode[0] = 'l';
+ break;
+ case DT_SOCK:
+ info->mode[0] = 's';
+ break;
+ case DT_UNKNOWN:
+ info->mode[0] = 'u';
+ break;
+ case DT_WHT:
+ info->mode[0] = 'w';
+ break;
+ default:
+ info->mode[0] = '-';
+ break;
+ }
+
info->mode[1] = (s.st_mode & S_IRUSR) ? 'r' : '-';
info->mode[2] = (s.st_mode & S_IWUSR) ? 'w' : '-';
if (s.st_mode & S_IXUSR) {
@@ -146,21 +173,31 @@ static bool get_file_info(struct dirent* file, const char* dir_path, struct File
info->usr = getpwuid(s.st_uid);
info->grp = getgrgid(s.st_gid);
info->links = s.st_nlink;
- info->type = file->d_type;
+ info->type = ty;
- strcpy(info->name, file->d_name);
+ strcpy(info->name, file_path);
print_file_size(s.st_size, info->size);
- print_date_time(s.st_mtim.tv_sec + s.st_mtim.tv_nsec / 1000000, info->date);
+ print_date_time(s.st_mtim.tv_sec + s.st_mtim.tv_nsec / 1000000000, info->date);
return true;
}
static char* get_file_color(struct FileInfo* info) {
char* color;
if (info->type == DT_DIR) {
- color = DIR_COLOR;
+ if (info->mode[8] == 'w') {
+ color = DIR_COLOR_EXEC;
+ } else {
+ color = DIR_COLOR;
+ }
} else if (info->type == DT_LNK) {
color = LINK_COLOR;
+ } else if (
+ info->type == DT_CHR ||
+ info->type == DT_BLK ||
+ info->type == DT_SOCK
+ ) {
+ color = BLK_COLOR;
} else {
if (info->set_uid) {
color = SET_UID_COLOR;
@@ -181,7 +218,8 @@ static void list_files(struct FileInfo* files, int file_len, struct FileListInfo
if (!isatty(1)) {
flags->one_column = true;
- flags->colored = false;
+ if (flags->colored == AUTO)
+ flags->colored = NO;
}
char* color;
@@ -192,7 +230,7 @@ static void list_files(struct FileInfo* files, int file_len, struct FileListInfo
struct FileInfo finfo = files[i];
color = get_file_color(&finfo);
if (flags->more_info) {
- printf("%s %*d %*s %*s %*s %s %s%s\x1b[0m",
+ printf("%s %*d %*s %*s %*s %s %s%s%s",
finfo.mode,
info.max_link,
finfo.links,
@@ -203,37 +241,40 @@ static void list_files(struct FileInfo* files, int file_len, struct FileListInfo
info.max_size,
finfo.size,
finfo.date,
- flags->colored ? color : FILE_COLOR,
- finfo.name
+ flags->colored != NO ? color : "",
+ finfo.name,
+ flags->colored != NO ? "\x1b[0m" : ""
);
if (finfo.type == DT_LNK) {
char path[PATH_MAX];
append_path(path, dir_path, finfo.name);
char lnk[PATH_MAX];
- if (readlink(path, lnk, PATH_MAX) < 0) {
- putchar('\n');
+ ssize_t n;
+ if ((n = readlink(path, lnk, PATH_MAX)) != -1) {
+ printf(" -> %.*s\n", (int)n, lnk);
} else {
- printf(" -> %s\n", lnk);
+ putchar('\n');
}
} else {
putchar('\n');
}
} else if (flags->one_column) {
- printf("%s%s\x1b[0m\n", color, finfo.name);
+ printf("%s%s%s\n", color, finfo.name, flags->colored != NO ? "\x1b[0m" : "");
} else {
if (info.total_len > w.ws_col) {
if (i != 0 && i % row_count == 0) putchar('\n');
- printf("%s%*s\x1b[0m", flags->colored ? color : FILE_COLOR, -column_width, finfo.name);
+ printf("%s%*s%s", flags->colored != NO ? color : "", -column_width,
+ finfo.name, flags->colored != NO ? "\x1b[0m" : "");
} else {
- printf("%s%s\x1b[0m ", flags->colored ? color : FILE_COLOR, finfo.name);
+ printf("%s%s%s ", flags->colored != NO ? color : "", finfo.name,
+ flags->colored != NO ? "\x1b[0m" : "");
}
}
}
- if (info.total_len <= w.ws_col) printf("\n");
-
+ if (!flags->more_info) printf("\n");
}
static bool is_dot_dir(const char* path) {
@@ -254,25 +295,24 @@ static void push_file(
struct FileInfo** files,
struct FileListInfo* info,
int* size, int* capacity,
- struct dirent* file,
+ const char* file_path,
const char* dir_path
) {
struct FileInfo finfo;
- if (!get_file_info(file, dir_path, &finfo)) return;
+ if (!get_file_info(file_path, dir_path, &finfo)) return;
if (*size == *capacity) {
*capacity *= 2;
*files = realloc(*files, sizeof(struct FileInfo) * *capacity);
}
-
int user_len = strlen(finfo.usr->pw_name);
if (user_len > info->max_usr) info->max_usr = user_len;
int group_len = strlen(finfo.grp->gr_name);
if (group_len > info->max_grp) info->max_grp = group_len;
- int name_len = strlen(file->d_name);
+ int name_len = strlen(file_path);
if (name_len > info->max_name) info->max_name = name_len;
int size_len = strlen(finfo.size);
@@ -307,10 +347,13 @@ static bool recurse_directory(char* path, struct Flags* flags) {
if (!flags->hidden && prefix(".", file->d_name)) continue;
if (is_dot_dir(file->d_name)) continue;
if (first) {
- printf("\n%s%s:%s\n", DIR_COLOR, path, FILE_COLOR);
+ if (flags->colored == NO)
+ printf("\n%s:\n", path);
+ else
+ printf("\n%s%s:%s\n", DIR_COLOR, path, FILE_COLOR);
first = false;
}
- push_file(&files, &info, &size, &capacity, file, path);
+ push_file(&files, &info, &size, &capacity, file->d_name, path);
}
list_files(files, size, info, flags, path);
@@ -355,16 +398,39 @@ static bool list_directory(char* path, struct Flags* flags) {
while ((file = readdir(d)) != NULL) {
if (!flags->hidden && prefix(".", file->d_name)) continue;
if (flags->hide_dot && is_dot_dir(file->d_name)) continue;
- push_file(&files, &info, &size, &capacity, file, path);
+ push_file(&files, &info, &size, &capacity, file->d_name, path);
}
- list_files(files, size, info, flags, path);
+ if (size > 0) list_files(files, size, info, flags, path);
free(files);
closedir(d);
return true;
}
+static bool is_dir(const char* path) {
+ struct stat s;
+ if (stat(path, &s) < 0) return false;
+ return S_ISDIR(s.st_mode);
+}
+
+static void list_file_args(int start, int argc, char** argv, struct Flags* flags) {
+ int capacity = 8;
+ int size = 0;
+ struct FileInfo* files = malloc(sizeof(struct FileInfo) * capacity);
+ struct FileListInfo info;
+ memset(&info, 0, sizeof(struct FileListInfo));
+
+ for (int i = start; i < argc; i++) {
+ if (is_dir(argv[i])) continue;
+ push_file((struct FileInfo**) &files, &info, &size, &capacity, argv[i], ".");
+ }
+
+ if (size > 0) list_files(files, size, info, flags, ".");
+
+ free(files);
+}
+
static void help() {
printf("Usage: ls [FILE]...\n\n");
printf("List directory contents\n\n");
@@ -384,15 +450,24 @@ COMMAND(ls) {
flags.hide_dot = false;
flags.one_column = false;
flags.recurse = false;
- flags.colored = false;
+ flags.colored = AUTO;
int start = 0;
for (int i = 0; i < argc; i++) {
if (!prefix("-", argv[i])) break;
if (streql("--help", argv[i])) help();
start++;
- if (streql("--color=auto", argv[i]) || streql("--color=yes", argv[i])) {
- flags.colored = true;
+ if (prefix("--color=", argv[i])) {
+ char* arg = argv[i] + 8;
+ if (streql("yes", arg) || streql("always", arg)) {
+ flags.colored = YES;
+ } else if (streql("auto", arg)) {
+ flags.colored = AUTO;
+ } else if (streql("no", arg) || streql("never", arg)) {
+ flags.colored = NO;
+ } else {
+ error("error: invalid color options: %s", arg);
+ }
continue;
}
for (size_t j = 1; j < strlen(argv[i]); j++) {
@@ -422,14 +497,19 @@ COMMAND(ls) {
if (argc - start == 0) {
list_directory(".", &flags);
- if (!flags.more_info) printf("\n");
return EXIT_SUCCESS;
}
+ list_file_args(start, argc, argv, &flags);
+
bool titled = argc - start > 1;
for (int i = start; i < argc; i++) {
+ if (!is_dir(argv[i])) continue;
if (titled && !flags.recurse) {
- printf("\n%s%s:%s\n", DIR_COLOR, argv[i], FILE_COLOR);
+ if (flags.colored != NO)
+ printf("\n%s%s:%s\n", DIR_COLOR, argv[i], FILE_COLOR);
+ else
+ printf("\n%s:\n", argv[i]);
}
if (list_directory(argv[i], &flags) && i + 1 != argc)
if (titled && !flags.recurse) printf("\n");
generated by cgit v1.2.3-freya (git 2.51.0) at 2025-09-22 15:37:12 +0000