minibox: Add sha1sum

4 files changed, 6 insertions, 6 deletions

diff --git a/userland/minibox/Makefile b/userland/minibox/Makefile
index 5d1e359..5192b17 100644
--- a/userland/minibox/Makefile
+++ b/userland/minibox/Makefile
@@ -1,6 +1,6 @@
 CC="i686-sb-gcc"
 CFLAGS=-Wall -Wextra -pedantic -Wimplicit-fallthrough -g -O0
-OBJ=minibox.o utilities/cat.o utilities/echo.o utilities/yes.o utilities/minibox.o utilities/ascii.o utilities/wc.o utilities/init.o utilities/ls.o utilities/touch.o utilities/ed.o utilities/sh/sh.o utilities/sh/lexer.o utilities/sh/ast.o utilities/kill.o
+OBJ=minibox.o utilities/cat.o utilities/echo.o utilities/yes.o utilities/minibox.o utilities/ascii.o utilities/wc.o utilities/init.o utilities/ls.o utilities/touch.o utilities/ed.o utilities/sh/sh.o utilities/sh/lexer.o utilities/sh/ast.o utilities/kill.o utilities/sha1sum.o
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) $(LIBS) -c $< -o $@
diff --git a/userland/minibox/minibox.c b/userland/minibox/minibox.c
index e5a7f79..a23c6b2 100644
--- a/userland/minibox/minibox.c
+++ b/userland/minibox/minibox.c
@@ -16,13 +16,13 @@ typedef struct Command {
 
 #define STR2(_x) #_x
 #define STR(_x) STR2(_x)
-#define COMMAND(NAME)                                                          \
-  { STR(NAME), NAME##_main }
+#define COMMAND(NAME) {STR(NAME), NAME##_main}
 
 Command utilities[] = {COMMAND(minibox), COMMAND(ascii), COMMAND(echo),
                        COMMAND(cat),     COMMAND(yes),   COMMAND(wc),
                        COMMAND(init),    COMMAND(ls),    COMMAND(touch),
-                       COMMAND(ed), COMMAND(sh), COMMAND(kill)};
+                       COMMAND(ed),      COMMAND(sh),    COMMAND(kill),
+                       COMMAND(sha1sum)};
 
 char *parse_filename(char *str) {
   char *tmp = NULL, *is = str;
diff --git a/userland/minibox/utilities/cat.c b/userland/minibox/utilities/cat.c
index c528d49..736aee6 100644
--- a/userland/minibox/utilities/cat.c
+++ b/userland/minibox/utilities/cat.c
@@ -22,7 +22,7 @@ int fd_to_stdout(int fd) {
 }
 
 int cat_main(int argc, char **argv) {
-  int fd = fd_stdin;
+  int fd = STDIN_FILENO;
 
   // If no file operands are specified, the standard input shall be
   // used.
diff --git a/userland/minibox/utilities/include.h b/userland/minibox/utilities/include.h
index a3bd561..6df6ef0 100644
--- a/userland/minibox/utilities/include.h
+++ b/userland/minibox/utilities/include.h
@@ -39,5 +39,5 @@ int touch_main(int argc, char **argv);
 int ed_main(int argc, char **argv);
 int sh_main(int argc, char **argv);
 int kill_main(int argc, char **argv);
-
 int init_main(void);
+int sha1sum_main(int argc, char **argv);