From 1301d3f5efe7b05d8724f10bdb2633e82a73e736 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 30 Nov 2023 10:32:18 +0300 Subject: [PATCH] ls fix: d flag --- coreutils/ls.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/coreutils/ls.c b/coreutils/ls.c index c2be979..130b510 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -151,7 +151,9 @@ int print(const struct d_node *node) { char ind = '-'; char *color = ""; if (S_ISDIR(node->stats.st_mode)) { - suf = '/'; + if (node->name[strlen(node->name) - 1] != '/') + suf = '/'; + ind = 'd'; color = LS_DIR_COLOR; } @@ -220,10 +222,7 @@ void col_print(struct d_node **node, size_t files, struct winsize w) { maxlen = strlen(node[i]->name); /* Calc */ - maxlen += 2; - if (F_flag) - maxlen++; - + maxlen += 3; size_t ncols = w.ws_col / maxlen; size_t nrows = files; if (ncols > 1) {