Use musl instead of litc in biscuit programs

biscuit/CMakeLists.txt

@@ -17,7 +17,7 @@ if (${ARCH} STREQUAL i386)
     set(CMAKE_C_FLAGS       "-m32 -mno-red-zone")
 elseif (${ARCH} STREQUAL x86_64)
     if(APPLE)
-        set(PREFIX          x86_64-elf-)
+        set(PREFIX          x86_64-linux-musl-)
     endif ()
     set(CMAKE_C_FLAGS       "-m64 -mno-red-zone")
 elseif (${ARCH} STREQUAL riscv32)
@@ -39,17 +39,13 @@ endif ()
 set(CMAKE_ASM_COMPILER      ${PREFIX}gcc)
 set(CMAKE_C_COMPILER        ${PREFIX}gcc)
 set(CMAKE_RANLIB            ${PREFIX}ranlib)
-set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS} -Wall -Werror -MMD -MP -O -g -ffreestanding -nostdlib -nostdinc -fno-builtin -fno-stack-protector -fPIC -std=gnu11")
+set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS} -Wall -Werror -Wno-pointer-to-int-cast -Wno-format -MMD -MP -O -g -fPIC -std=gnu99")
 set(CMAKE_ASM_FLAGS         ${CMAKE_C_FLAGS})
-set(CMAKE_C_LINK_FLAGS      "${LINK_FLAGS} -nostdlib")  # override default value to get rid of '-Wl,-search_paths_first -Wl,-headerpad_max_install_names'
+set(CMAKE_C_LINK_FLAGS      "${LINK_FLAGS}")  # override default value to get rid of '-Wl,-search_paths_first -Wl,-headerpad_max_install_names'
 set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)                  # override default value to get rid of '-rdynamic' on Linux
 
-# Library
-add_library(ulib ${LIBS})
-
 # Execuatble
 foreach (PATH ${SRCS})
     get_filename_component(NAME ${PATH} NAME_WE)
     add_executable(${NAME} ${PATH})
-    target_link_libraries(${NAME} ulib gcc)
 endforeach ()

biscuit/c/bimage.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static int lstn(uint16_t lport)
 {
@@ -126,6 +126,6 @@ int main(int argc, char **argv)
 	if (close(fd) == -1)
 		err(-1, "close");
 	fprintf(stderr, "wrote %zu bytes. rebooting.\n", did);
-	reboot();
+	reboot(RB_AUTOBOOT);
 	return 0;
 }

biscuit/c/bmgc.c.bak

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static long
 _fetch(long n)

biscuit/c/bmgc2.c.bak

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static long
 nowms(void)

biscuit/c/bmopen.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/bmread.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[512];
 

biscuit/c/bmwrite.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[512];
 

biscuit/c/cat.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/cksum.c

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <common.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>

biscuit/c/cls.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/conio.c

@@ -1,9 +1,11 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {
 	while (1) {
-		char *ret = readline("input:");
+        printf("input:");
+        char buf[1024];
+		char *ret = gets(buf);
 		if (!ret)
 			break;
 		printf("got: %s\n", ret);

biscuit/c/ebizzy.c

@@ -41,7 +41,7 @@
  *
  */
 
-#include <stdio.h>
+#include <common.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/mman.h>

biscuit/c/echo.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/fault.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/fault2.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/fcgi.c

@@ -1,4 +1,4 @@
-#include<stdio.h>
+#include<common.h>
 #include<unistd.h>
 #include<err.h>
 #include<poll.h>

biscuit/c/fork.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 void child(int id)
 {

biscuit/c/fsbigwrite.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[5120];
 

biscuit/c/fscreat.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fsfree.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fslink.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fsmkdir.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fstest.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fsunlink.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fswrite.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char buf[1024];
 

biscuit/c/fweb.c.bak

@@ -1,4 +1,4 @@
-#include<stdio.h>
+#include<common.h>
 #include<unistd.h>
 #include<err.h>
 #include<sys/socket.h>

biscuit/c/getpid.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main()
 {

biscuit/c/goodcit.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 void cmb(void)
 {

biscuit/c/halp.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static void gcrun(char * const *cmd, long *_ngcs, long *_xput, double *_gcfrac)
 {
@@ -281,7 +281,7 @@ __attribute__((unused))
 static void usage()
 {
 	fprintf(stderr, "usage: %s [-n target gcs] [-c target gc frac]"
-	    " -x <0gc xput> <allocr>\n", __progname);
+	    " -x <0gc xput> <allocr>\n", "halp");
 	exit(-1);
 }
 

biscuit/c/head.c

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <common.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>

biscuit/c/hello.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/include-litc/litc.h

@@ -715,9 +715,7 @@ typedef struct {
 	struct dirent dents[];
 } DIR;
 
-// tls is not fully supported at the time
+extern __thread int errno;
-//extern __thread int errno;
-extern int errno;
 
 #define		BUFSIZ		4096
 #define		L_tmpnam	20

biscuit/c/include/common.h

@@ -0,0 +1,27 @@
+#include <arpa/inet.h>
+#include <dirent.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/kdev_t.h>
+#include <pthread.h>
+#include <poll.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/un.h>
+#include <sys/reboot.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <spawn.h>
+#include <unistd.h>
+#include <uchar.h>
+
+#define WAIT_ANY (-1)
+#include <limits.h>
+#define uchar unsigned char

biscuit/c/init.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static void fexec(char * const args[])
 {

biscuit/c/kill.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/killtest.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/less.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/libs/litc.c

@@ -64,9 +64,7 @@
 #define SYS_FUTEX        31342
 #define SYS_GETTID       31343
 
-// tls is not fully support at the time
+__thread int errno;
-//__thread int errno;
-int errno;
 
 static int dolock = 1;
 

biscuit/c/lnc.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static char lmss[1ul << 11];
 
@@ -81,7 +81,7 @@ int nc(int s)
 static void usage()
 {
 	fprintf(stderr, "usage:\n"
-	    "%s [-M] [-c host] [-p port] [-l listen port]\n", __progname);
+	    "%s [-M] [-c host] [-p port] [-l listen port]\n", "lnc");
 	exit(-1);
 }
 

biscuit/c/ls.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 void dprint(int fd, char *par, int left, int rec)
 {
@@ -77,7 +77,7 @@ void usage(void)
 {
 	fprintf(stderr, "%s [-R]\n"
 	    "-R    recurse subdirectories\n"
-	    "\n", __progname);
+	    "\n", "ls");
 	exit(-1);
 }
 

biscuit/c/lsh.c.bak

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 void mkargs(char *line, char *args[], size_t n)
 {

biscuit/c/mkdir.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/mknodtest.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/mmapbench.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static long
 nowms(void)

biscuit/c/mmaptest.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 char *ps[1000];
 

biscuit/c/mv.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/pipetest.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 int main(int argc, char **argv)
 {

biscuit/c/pthtests.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 __thread int id;
 

biscuit/c/pwd.c

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <common.h>
 #include <unistd.h>
 
 int main(int argc, char **argv)

biscuit/c/reboot.c

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <common.h>
 #include <unistd.h>
 
 int main(int argc, char **argv)
@@ -6,6 +6,6 @@ int main(int argc, char **argv)
 	printf("syncing...");
 	sync();
 	printf("done. rebooting...\n");
-	reboot();
+	reboot(RB_AUTOBOOT);
 	return 0;
 }

biscuit/c/rmtree.c

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <common.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
@@ -35,8 +35,7 @@ void rm(char *fn)
 	struct stat st;
 	if (stat(fn, &st) == -1)
 		err(-1, "stat");
-	if (S_ISREG(st.st_mode) || S_ISSOCK(st.st_mode) ||
+	if (S_ISREG(st.st_mode) || S_ISSOCK(st.st_mode)) {
-	    S_ISDEV(st.st_mode)) {
 		if (unlink(fn) == -1)
 			err(-1, "unlink");
 		return;
@@ -51,7 +50,7 @@ int main(int argc, char **argv)
 {
 	if (argc != 2) {
 		fprintf(stderr, "usage: %s <non-empty dir to remove>\n",
-		    __progname);
+		    "rmtree");
 		exit(-1);
 	}
 	char *fn = argv[1];

biscuit/c/rshd.c

@@ -1,4 +1,4 @@
-#include <litc.h>
+#include <common.h>
 
 static int lstn(uint16_t lport)
 {