libc/include/string.h

@@ -38,9 +38,6 @@ extern "C"
     /* Return a pointer to the first occurrence of the character c in str, or NULL if it could not be found. */
     char* strchr(const char* str, int c);
 
-    /* Return a pointer to the last occurrence of the character c in str, or NULL if it could not be found. */
-    char* strrchr(const char* str, int c);
-
     /* Return a heap-allocated copy of a string. */
     char* strdup(const char* str);
 

libluna/include/luna/CString.h

@@ -23,6 +23,10 @@ extern "C"
     char* strdup(const char* str);
     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);
 
     [[deprecated]] char* strcpy(char* dst, const char* src);

libluna/src/CString.cpp

@@ -96,6 +96,12 @@ extern "C"
         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* s = dest;

libluna/src/TarStream.cpp

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