8nl
/
micro-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls fix: column, list dir

This commit is contained in:
Your Name 2023-11-29 22:52:35 +03:00
parent bc6e7d8a60
commit 369f3af147
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
coreutils/ls.c
View File

@ -102,9 +102,11 @@ struct d_node **list(const char *path, size_t *nfiles) {
exit(1);
}
for (size_t i = 0; i < files; i++) {
dir[i] = cur;
cur = cur->next;
for (size_t i = 0; ; i++) {
dir[i] = dr;
dr = dr->next;
if (dr == NULL)
break;
}
return dir;
@ -218,7 +220,10 @@ void col_print(struct d_node **node, size_t files, struct winsize w) {
maxlen = strlen(node[i]->name);
/* Calc */
maxlen += 4;
maxlen += 2;
if (F_flag)
maxlen++;
size_t ncols = w.ws_col / maxlen;
size_t nrows = files;
if (ncols > 1) {