apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

libluna+kernel: Get rid of nullcpy()
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
apio 2023-03-12 10:28:50 +01:00
parent 7649b44aab
commit af0cb83a58
Signed by: apio
GPG Key ID: B8A7D06E42258954
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libluna/include/luna/CString.h
View File

@ -23,10 +23,6 @@ extern "C"
char* strdup(const char* str); char* strdup(const char* str);
char* strndup(const char* str, usize max); char* strndup(const char* str, usize max);
// Copies len bytes from src into dest and adds a null terminator.
// FIXME: Replace this invented function with strlcpy().
void nullcpy(char* dest, const char* src, usize len);
usize strlcpy(char* dest, const char* src, usize len); usize strlcpy(char* dest, const char* src, usize len);
[[deprecated]] char* strcpy(char* dst, const char* src); [[deprecated]] char* strcpy(char* dst, const char* src);

6
libluna/src/CString.cpp
View File

@ -96,12 +96,6 @@ extern "C"
return dest; return dest;
} }
void nullcpy(char* dest, const char* src, usize len)
{
memcpy(dest, src, len);
dest[len] = 0;
}
char* strcpy(char* dest, const char* src) char* strcpy(char* dest, const char* src)
{ {
char* s = dest; char* s = dest;

4
libluna/src/TarStream.cpp
View File

@ -40,7 +40,7 @@ Result<TarStream::Entry> TarStream::parse_header(const TarStream::TarHeader* hdr
Entry entry; Entry entry;
char size[13]; char size[13];
nullcpy(size, hdr->size, 12); strlcpy(size, hdr->size, 13);
entry.size = parse_unsigned_integer(size, nullptr, 8); entry.size = parse_unsigned_integer(size, nullptr, 8);
entry.mode = (mode_t)parse_unsigned_integer(hdr->mode, nullptr, 8); entry.mode = (mode_t)parse_unsigned_integer(hdr->mode, nullptr, 8);
@ -56,7 +56,7 @@ Result<TarStream::Entry> TarStream::parse_header(const TarStream::TarHeader* hdr
default: return err(EFIXME); default: return err(EFIXME);
} }
if (!strlen(hdr->prefix)) { nullcpy(entry.name, hdr->name, 100); } if (!strlen(hdr->prefix)) { strlcpy(entry.name, hdr->name, 101); }
else { return err(EFIXME); } else { return err(EFIXME); }
if (entry.size) if (entry.size)