Compare commits

...

2 Commits

8 changed files with 29 additions and 30 deletions

@ -29,8 +29,8 @@ extern "C"
[[deprecated]] char* strcpy(char* dst, const char* src); [[deprecated]] char* strcpy(char* dst, const char* src);
[[deprecated]] char* strcat(char* dst, const char* src); [[deprecated]] char* strcat(char* dst, const char* src);
char* strncpy(char* dest, const char* src, size_t max); char* strncpy(char* dest, const char* src, usize max);
char* strncat(char* dest, const char* src, size_t max); char* strncat(char* dest, const char* src, usize max);
char* strchr(const char* str, int c); char* strchr(const char* str, int c);
char* strrchr(const char* str, int c); char* strrchr(const char* str, int c);

@ -11,7 +11,7 @@ template <usize Size> class StaticString
adopt(string); adopt(string);
} }
template<usize OtherSize> StaticString(const StaticString<OtherSize>& other) template <usize OtherSize> StaticString(const StaticString<OtherSize>& other)
{ {
adopt(other.chars()); adopt(other.chars());
} }

@ -67,7 +67,7 @@ extern "C"
int strncmp(const char* a, const char* b, usize max) int strncmp(const char* a, const char* b, usize max)
{ {
const char* s = a; const char* s = a;
while (*a && (*a == *b) && (size_t)(a - s) < (max - 1)) while (*a && (*a == *b) && (usize)(a - s) < (max - 1))
{ {
a++; a++;
b++; b++;
@ -124,18 +124,18 @@ extern "C"
return s; return s;
} }
char* strncpy(char* dest, const char* src, size_t max) char* strncpy(char* dest, const char* src, usize max)
{ {
size_t i; usize i;
for (i = 0; i < max && src[i] != 0; i++) dest[i] = src[i]; for (i = 0; i < max && src[i] != 0; i++) dest[i] = src[i];
for (; i < max; i++) dest[i] = 0; for (; i < max; i++) dest[i] = 0;
return dest; return dest;
} }
char* strncat(char* dest, const char* src, size_t max) char* strncat(char* dest, const char* src, usize max)
{ {
size_t len = strlen(dest); usize len = strlen(dest);
size_t i; usize i;
for (i = 0; i < max && *(src + i); i++) *(dest + len + i) = *(src + i); for (i = 0; i < max && *(src + i); i++) *(dest + len + i) = *(src + i);

@ -4,11 +4,7 @@ source $(dirname $0)/env.sh
cd $LUNA_ROOT cd $LUNA_ROOT
SOURCES=($(find kernel/src -type f | grep -v "\.asm")) source tools/sources.sh
SOURCES+=($(find libluna/src -type f))
SOURCES+=($(find libluna/include/luna -type f))
SOURCES+=($(find libos/src -type f))
SOURCES+=($(find libos/include/os -type f))
ALL_OK=1 ALL_OK=1

@ -1,15 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
source $(dirname $0)/env.sh source $(dirname $0)/env.sh
cd $LUNA_ROOT cd $LUNA_ROOT
SOURCES=($(find kernel/src -type f | grep -v "\.asm" | grep -v "bootboot.h")) source tools/sources.sh
SOURCES+=($(find libluna/src -type f))
SOURCES+=($(find libluna/include/luna -type f | grep -v "Types.h")) SOURCES=($(printf -- '%s\n' "${SOURCES[@]}" | grep -v libc | grep -v "Types.h" | grep -v "bootboot.h"))
SOURCES+=($(find libos/src -type f))
SOURCES+=($(find libos/include/os -type f))
SUCCESS=1 SUCCESS=1

@ -5,11 +5,9 @@ source $(dirname $0)/env.sh
cd $LUNA_ROOT cd $LUNA_ROOT
SOURCES=($(find kernel/src -type f | grep -v "\.asm" | grep -v "bootboot.h")) source tools/sources.sh
SOURCES+=($(find libluna/src -type f))
SOURCES+=($(find libluna/include/luna -type f | grep -v "Types.h")) SOURCES=($(printf -- '%s\n' "${SOURCES[@]}" | grep -v libc | grep -v "Types.h" | grep -v "bootboot.h"))
SOURCES+=($(find libos/src -type f))
SOURCES+=($(find libos/include/os -type f))
for f in ${SOURCES[@]} for f in ${SOURCES[@]}
do do

@ -5,11 +5,7 @@ source $(dirname $0)/env.sh
cd $LUNA_ROOT cd $LUNA_ROOT
SOURCES=($(find kernel/src -type f | grep -v "\.asm")) source tools/sources.sh
SOURCES+=($(find libluna/src -type f))
SOURCES+=($(find libluna/include/luna -type f))
SOURCES+=($(find libos/src -type f))
SOURCES+=($(find libos/include/os -type f))
for f in ${SOURCES[@]} for f in ${SOURCES[@]}
do do

12
tools/sources.sh Executable file

@ -0,0 +1,12 @@
#!/bin/sh
source $(dirname $0)/env.sh
cd $LUNA_ROOT
FOLDERS=(kernel libc libos libluna apps)
SOURCES=($(find ${FOLDERS[@]} -type f -name "*.cpp"))
SOURCES+=($(find ${FOLDERS[@]} -type f -name "*.h"))
export SOURCES