fix

Makefile

@@ -0,0 +1,10 @@
+CFLAGS?=-Wall -Wextra -pedantic -Ibuilder -Ilibmu -Os -s
+CC?=cc
+
+all:
+	$(CC) builder/builder.c $(CFLAGS) -obuild
+	./build
+
+clean:
+	rm bin/*
+	rm build

build.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-cc builder/builder.c -Wall -Wextra -Os -s -pedantic -Ilibmu -obuild
+cc builder/builder.c -Wall -Wextra -pedantic -Ibuilder -Ilibmu -Os -s -obuild
 ./build
 rm build

builder/builder.c

@@ -36,7 +36,7 @@ char *MakePath(const char *src, const char *output_dir) {
 
 void Compile(const char *src, const char *output_dir) {
 	char *path = MakePath(src, output_dir);
-	printf("[CC] Building %s -> %s\n", src, path);
+	printf(CC_FMT, src, path);
 
 	pid_t pid;
 	if ((pid = fork()) == 0) {
@@ -51,7 +51,7 @@ void Compile(const char *src, const char *output_dir) {
 	}
 
 	else if (pid == -1) {
-		fprintf(stderr, "%s", "builder: fork failed");
+		fprintf(stderr, "builder: fork failed");
 		exit(1);
 	}
 
@@ -69,7 +69,7 @@ void ListAndCompile(const char *dir, const char *output_dir) {
 		exit(1);
 	}
 
-	printf("[CHDIR] %s\n", dir);
+	printf(CHDIR_FMT, dir);
 	DIR *dp = opendir(".");
 
 	struct dirent *ep;
@@ -85,9 +85,6 @@ void ListAndCompile(const char *dir, const char *output_dir) {
 }
 
 int main(void) {
-	/* for (size_t i = 0; i < sizeof(libs) / sizeof(char *); i++)
-		ListAndCompile(objects[i], "../obj"); */
-
 	for (size_t i = 0; i < sizeof(objects) / sizeof(char *); i++)
 		ListAndCompile(objects[i], "../bin");
 

builder/config.h

@@ -10,6 +10,9 @@ const char *objects[] = {
 	/* "sysutils" */
 };
 
+#define CHDIR_FMT "Making \033[32m%s\033[0m\n"
+#define CC_FMT "CC %10s -> %s\n"
+
 #define CFLAGS "-Wall", "-Werror", "-Wextra", "-pedantic", "-flto", "-Os", "-s", "-I", "../libmu", "-I", "../"
 #define CC "cc"
 #endif

config.h

@@ -1,16 +1,16 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-/* Depends: cat tee wc */
+/* (cat tee wc) */
 #define BUF_SIZE 4096
 
-/* Random source for shred */
+/* Random source (shred) */
 #define RAND_SOURCE "/dev/urandom"
 
 /* format for printf (head) */
 #define HEAD_FMT "==> %s <==\n"
 
-/* du block size */
+/* block size (du)*/
 #define BLK_SIZE 512
 
 /* Options: To disable, comment line */

coreutils/ls.c

@@ -186,10 +186,9 @@ void col_print(struct d_node **node, size_t files, struct winsize w) {
 			if (i * ncols + j < files) {
 				if (col > 0) {
 					nexttab -= col;
+					col += nexttab;
 					for (int k = 0; k < nexttab; k++)
 						putchar(' ');
-
-					col += nexttab;
 				}
 
 				nexttab = col + (int)maxlen;