Merge branch 'cooking'

Conflicts:
	test.c

diff --git a/test.c b/test.c
index bf429853b263c39ca2732807098ac184f37f2686..6d8e9ad7192bf08ff2e583c5b3be9c343d57e37b 100644 (file)
--- a/test.c
+++ b/test.c
@@ -85,7 +85,7 @@ static fs_file_t **task_popen(const char *command, const char *mode) {
             while (*line != '\0' && *line != ' ' &&
                    *line != '\t' && *line != '\n') line++;
         }
-        vec_push(argv, NULL);
+        vec_push(argv, (char *)0);
     }