mirror of
https://github.com/zeldaret/ss
synced 2026-06-06 03:28:56 -04:00
fixed regswap and matching
This commit is contained in:
committed by
robojumper
parent
92e5d46eef
commit
556fd33fc3
+1
-1
@@ -287,7 +287,7 @@ config.libs = [
|
||||
Object(NonMatching, "d/d_dvd_unk.cpp"),
|
||||
Object(NonMatching, "d/d_dylink.cpp"),
|
||||
Object(NonMatching, "d/d_heap.cpp"),
|
||||
Object(NonMatching, "d/d_rawarchive.cpp"),
|
||||
Object(Matching, "d/d_rawarchive.cpp"),
|
||||
Object(NonMatching, "d/d_stage.cpp"),
|
||||
Object(NonMatching, "d/d_sys.cpp"),
|
||||
Object(NonMatching, "d/a/d_a_base.cpp"),
|
||||
|
||||
+11
-4
@@ -137,10 +137,17 @@ bool dRawArcEntry_c::loadArcFromDiskChecked(const char *fileName, const char *di
|
||||
inline void inline_strncat(char *dest, const char *src, size_t destSize) {
|
||||
if (src != nullptr) {
|
||||
size_t destLen = strlen(dest);
|
||||
size_t srcLen = strlen(src);
|
||||
size_t count = destLen + srcLen + 1 >= destSize ? destSize - destLen - 1 : srcLen;
|
||||
strncpy(dest + destLen, src, count);
|
||||
size_t offset = destLen + count;
|
||||
size_t copyLen = strlen(src);
|
||||
|
||||
// Make sure copy length isnt more than destination length
|
||||
if (destLen + copyLen + 1 >= destSize) {
|
||||
copyLen = destSize - destLen - 1;
|
||||
}
|
||||
|
||||
strncpy(dest + destLen, src, copyLen);
|
||||
|
||||
// make sure string is null terminated
|
||||
size_t offset = destLen + copyLen;
|
||||
dest[offset] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user