move all c stdlib files to c-stdlib directory

contrun · Sep 7, 2023 · c41aec1 · c41aec1
1 parent 48069fd
commit c41aec1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 18 deletions.
diff --git a/lualib/Makefile b/lualib/Makefile
@@ -37,7 +37,7 @@ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix
 
 LUA_A=	liblua.a
 CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
-LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o lstrlib.o ltablib.o lutf8lib.o linit.o mocked_stdio.o mocked_math.o stdlib.o
+LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o lstrlib.o ltablib.o lutf8lib.o linit.o stdlib.o
 BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
 
 LUA_T=	lua

diff --git a/lualib/mocked_math.h → lualib/c-stdlib/mocked_math.h b/lualib/mocked_math.h → lualib/c-stdlib/mocked_math.h
diff --git a/lualib/mocked_stdio.h → lualib/c-stdlib/mocked_stdio.h b/lualib/mocked_stdio.h → lualib/c-stdlib/mocked_stdio.h
@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "../include/ckb_cell_fs.h"
+#include "../../include/ckb_cell_fs.h"
 
 #define BUFSIZ 512
 #define EOF (-1)
@@ -53,15 +53,11 @@ int sprintf(char *__s, const char *__format, ...);
 
 int vfprintf(FILE *__s, const char *__format, ...);
 
-int vprintf(const char *__format, ...);
-
 int vsprintf(char *__s, const char *__format, ...);
 
 int snprintf(char *__s, size_t __maxlen, const char *__format, ...);
 int snprintf_(char *__s, size_t __maxlen, const char *__format, ...);
 
-int vsnprintf(char *__s, size_t __maxlen, const char *__format, ...);
-
 int fscanf(FILE *__stream, const char *__format, ...);
 
 int scanf(const char *__format, ...);

diff --git a/lualib/mocked_string.h → lualib/c-stdlib/mocked_string.h b/lualib/mocked_string.h → lualib/c-stdlib/mocked_string.h
diff --git a/lualib/c-stdlib/src/impl.c b/lualib/c-stdlib/src/impl.c
@@ -10,6 +10,8 @@
 
 #include "printf_impl.h"
 #include "malloc_impl.h"
+#include "mocked_stdio.c"
+#include "mocked_math.c"
 
 #define CKB_SS (sizeof(size_t))
 #define CKB_ALIGN (sizeof(size_t) - 1)

diff --git a/lualib/math_log.c → lualib/c-stdlib/src/math_log.c b/lualib/math_log.c → lualib/c-stdlib/src/math_log.c
diff --git a/lualib/math_pow.c → lualib/c-stdlib/src/math_pow.c b/lualib/math_pow.c → lualib/c-stdlib/src/math_pow.c
diff --git a/lualib/math_private.h → lualib/c-stdlib/src/math_private.h b/lualib/math_private.h → lualib/c-stdlib/src/math_private.h
diff --git a/lualib/mocked_math.c → lualib/c-stdlib/src/mocked_math.c b/lualib/mocked_math.c → lualib/c-stdlib/src/mocked_math.c
@@ -1,4 +1,4 @@
-#include "mocked_math.h"
+#include "../mocked_math.h"
 #include <stdint.h>
 
 #include "math_pow.c"

diff --git a/lualib/mocked_stdio.c → lualib/c-stdlib/src/mocked_stdio.c b/lualib/mocked_stdio.c → lualib/c-stdlib/src/mocked_stdio.c
@@ -1,5 +1,4 @@
-
-#include "mocked_stdio.h"
+#include "../mocked_stdio.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -151,19 +150,10 @@ int fprintf(FILE *__stream, const char *__format, ...) {
     return 0;
 }
 
-int sprintf(char *__s, const char *__format, ...) {
-    NOT_IMPL(sprintf);
-    return 0;
-}
-
 int vfprintf(FILE *__s, const char *__format, ...) {
     NOT_IMPL(vfprintf);
     return 0;
 }
-int vprintf(const char *__format, ...) {
-    NOT_IMPL(vprintf);
-    return 0;
-}
 int vsprintf(char *__s, const char *__format, ...) {
     NOT_IMPL(vsprintf);
     return 0;