TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

More cats and cpys in files that xcode doesn't see

Browse source
This commit is contained in:
Glenn Smith 2018-03-07 01:13:56 -05:00
parent dce7f5f6b3
commit d9a723d533
21 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/platformX86UNIX/x86UNIXFileio.cpp
View file

@ -211,7 +211,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
dStrncpy(pathEl, currChar, pathElLen);
pathEl[pathElLen] = '\0';
dStrncpy(testPath, tempBuf, MaxPath);
dStrcat(testPath, pathEl);
dStrcat(testPath, pathEl, MaxPath);
if (stat(testPath, &filestat) != -1)
{
dStrncpy(tempBuf, testPath, MaxPath);
@ -226,7 +226,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
if (dStricmp(pathEl, ent->d_name) == 0)
{
foundMatch = true;
dStrcat(tempBuf, ent->d_name);
dStrcat(tempBuf, ent->d_name, MaxPath);
break;
}
}
@ -238,7 +238,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
}
if (*termChar == '/')
{
dStrcat(tempBuf, "/");
dStrcat(tempBuf, "/", MaxPath);
termChar++;
currChar = termChar;
}
@ -935,7 +935,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
TempAlloc< UTF8 > buf( dStrlen( newDir ) + 2 );
dStrcpy( buf, newDir );
dStrcpy( buf, newDir, buf.size );
ForwardSlash( buf );
return chdir( buf ) == 0;
@ -1267,7 +1267,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
{
char child[1024];
if ( (basePath[dStrlen(basePath) - 1]) == '/')
dStrcpy (child, d->d_name);
dStrcpy (child, d->d_name, 1024);
else
dSprintf(child, 1024, "/%s", d->d_name);
if (currentDepth < recurseDepth || recurseDepth == -1)

2
Engine/source/platformX86UNIX/x86UNIXInput.client.cpp
View file

@ -554,7 +554,7 @@ bool XClipboard::setClipboard(const char *text)
checkTDataSize(len);
// copy the data into the storage buffer
dStrcpy(mTData, text);
dStrcpy(mTData, text, mTDataSize);
// tell X that we own the clipboard. (we'll get events
// if an app tries to paste)

6
Engine/source/platformX86UNIX/x86UNIXNet.cpp
View file

@ -97,7 +97,7 @@ static Socket* addPolledSocket(NetSocket& fd, S32 state,
sock->fd = fd;
sock->state = state;
if (remoteAddr)
dStrcpy(sock->remoteAddr, remoteAddr);
dStrcpy(sock->remoteAddr, remoteAddr, 256);
if (port != -1)
sock->remotePort = port;
gPolledSockets.push_back(sock);
@ -242,7 +242,7 @@ NetSocket Net::openConnectTo(const char *addressString)
if(!dStrnicmp(addressString, "ip:", 3))
addressString += 3; // eat off the ip:
char remoteAddr[256];
dStrcpy(remoteAddr, addressString);
dStrcpy(remoteAddr, addressString, 256);
char *portString = dStrchr(remoteAddr, ':');
@ -814,7 +814,7 @@ bool Net::stringToAddress(const char *addressString, NetAddress *address)
if(strlen(addressString) > 255)
return false;
dStrcpy(remoteAddr, addressString);
dStrcpy(remoteAddr, addressString, 256);
char *portString = dStrchr(remoteAddr, ':');
if(portString)

2
Engine/source/platformX86UNIX/x86UNIXOGLVideo.client.cpp
View file

@ -41,7 +41,7 @@ bool InitOpenGL()
// Get the video settings from the prefs:
const char* resString = Con::getVariable( "$pref::Video::resolution" );
char* tempBuf = new char[dStrlen( resString ) + 1];
dStrcpy( tempBuf, resString );
dStrcpy( tempBuf, resString, dStrlen(resString) + 1 );
char* temp = dStrtok( tempBuf, " x\0" );
U32 width = ( temp ? dAtoi( temp ) : 800 );
temp = dStrtok( NULL, " x\0" );

2
Engine/source/platformX86UNIX/x86UNIXRedbook.cpp
View file

@ -102,7 +102,7 @@ void UnixRedBookDevice::setDeviceInfo(S32 deviceId, const char *deviceName)
#if !defined(__FreeBSD__)
mDeviceId = deviceId;
mDeviceName = new char[dStrlen(deviceName) + 1];
dStrcpy(mDeviceName, deviceName);
dStrcpy(mDeviceName, deviceName, dStrlen(deviceName) + 1);
#endif // !defined(__FreeBSD__)
}