diff --git a/programs/develop/ktcc/trunk/bin/lib/libck.a b/programs/develop/ktcc/trunk/bin/lib/libck.a index 910d97397b..cd0266c337 100644 Binary files a/programs/develop/ktcc/trunk/bin/lib/libck.a and b/programs/develop/ktcc/trunk/bin/lib/libck.a differ diff --git a/programs/develop/ktcc/trunk/libc/build.bat b/programs/develop/ktcc/trunk/libc/build.bat index 265d5a2259..7f2e9e1967 100644 --- a/programs/develop/ktcc/trunk/libc/build.bat +++ b/programs/develop/ktcc/trunk/libc/build.bat @@ -10,7 +10,7 @@ set CC=kos32-tcc set CFLAGS=-c -nostdinc -DGNUC -I"%cd%\%INCLUDE%" -Wall set AR=kos32-ar set ASM=fasm -set dirs=stdio memory kolibrisys string stdlib math dlfcn +set dirs=stdio memory kolibrisys string stdlib math dlfcn libgen rem #### END OF CONFIG SECTION #### set objs= diff --git a/programs/develop/ktcc/trunk/libc/include/libgen.h b/programs/develop/ktcc/trunk/libc/include/libgen.h new file mode 100644 index 0000000000..af17a911f5 --- /dev/null +++ b/programs/develop/ktcc/trunk/libc/include/libgen.h @@ -0,0 +1,7 @@ +#ifndef __KTCC_LIBGEN_H__ +#define __KTCC_LIBGEN_H__ + +char *basename(char *path); +char *dirname(char *path); + +#endif // __KTCC_LIBGEN_H__ diff --git a/programs/develop/ktcc/trunk/libc/include/string.h b/programs/develop/ktcc/trunk/libc/include/string.h index f69a8036f7..bd2ad06211 100644 --- a/programs/develop/ktcc/trunk/libc/include/string.h +++ b/programs/develop/ktcc/trunk/libc/include/string.h @@ -4,6 +4,7 @@ typedef unsigned int size_t; extern void* memchr(const void*,int,size_t); +extern void* memrchr(const void*,int,size_t); extern int memcmp(const void*,const void*,size_t); extern void* memcpy(void*,const void*,size_t); extern void* memmove(void*,const void*,size_t); diff --git a/programs/develop/ktcc/trunk/libc/libgen/basename.c b/programs/develop/ktcc/trunk/libc/libgen/basename.c new file mode 100644 index 0000000000..03f9813f33 --- /dev/null +++ b/programs/develop/ktcc/trunk/libc/libgen/basename.c @@ -0,0 +1,23 @@ +/* Return the name-within-directory of a file name. + Copyright (C) 1996-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +char * +basename (const char *filename) +{ + char *p = strrchr (filename, '/'); + return p ? p + 1 : (char *) filename; +} diff --git a/programs/develop/ktcc/trunk/libc/libgen/dirname.c b/programs/develop/ktcc/trunk/libc/libgen/dirname.c new file mode 100644 index 0000000000..b889f7d0c6 --- /dev/null +++ b/programs/develop/ktcc/trunk/libc/libgen/dirname.c @@ -0,0 +1,67 @@ +/* dirname - return directory part of PATH. + Copyright (C) 1996-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +char * +dirname (char *path) +{ + static const char dot[] = "."; + char *last_slash; + /* Find last '/'. */ + last_slash = path != NULL ? strrchr (path, '/') : NULL; + if (last_slash != NULL && last_slash != path && last_slash[1] == '\0') + { + /* Determine whether all remaining characters are slashes. */ + char *runp; + for (runp = last_slash; runp != path; --runp) + if (runp[-1] != '/') + break; + /* The '/' is the last character, we have to look further. */ + if (runp != path) + last_slash = memrchr (path, '/', runp - path); + } + if (last_slash != NULL) + { + /* Determine whether all remaining characters are slashes. */ + char *runp; + for (runp = last_slash; runp != path; --runp) + if (runp[-1] != '/') + break; + /* Terminate the path. */ + if (runp == path) + { + /* The last slash is the first character in the string. We have to + return "/". As a special case we have to return "//" if there + are exactly two slashes at the beginning of the string. See + XBD 4.10 Path Name Resolution for more information. */ + if (last_slash == path + 1) + ++last_slash; + else + last_slash = path + 1; + } + else + last_slash = runp; + last_slash[0] = '\0'; + } + else + /* This assignment is ill-designed but the XPG specs require to + return a string containing "." in any case no directory part is + found and so a static and constant string is required. */ + path = (char *) dot; + return path; +} \ No newline at end of file diff --git a/programs/develop/ktcc/trunk/libc/string/memrchr.c b/programs/develop/ktcc/trunk/libc/string/memrchr.c new file mode 100644 index 0000000000..742693a1e5 --- /dev/null +++ b/programs/develop/ktcc/trunk/libc/string/memrchr.c @@ -0,0 +1,12 @@ +/* memrchr.c from musl + */ + +#include + +void *memrchr(const void *m, int c, size_t n) +{ + const unsigned char *s = m; + c = (unsigned char)c; + while (n--) if (s[n]==c) return (void *)(s+n); + return 0; +}