Use strlcat() and strlcpy(), #define wrappers when these functions are not available.

[quix0rs-blobwars.git] / src / CGame.cpp

diff --git a/src/CGame.cpp b/src/CGame.cpp
index a5fa060eb739dcc54bac2e2d7b04446c942f9021..b75820da037c620dd94def504354d7da7e99679e 100644 (file)
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -66,8 +66,8 @@ void Game::clear()
                bulletsHit[i] = bulletsFired[i] = 0;
        }
 
-       strncpy(mapName, "data/grasslands1", sizeof mapName);
-       strncpy(stageName, "Grasslands", sizeof stageName);
+       strlcpy(mapName, "data/grasslands1", sizeof mapName);
+       strlcpy(stageName, "Grasslands", sizeof stageName);
 
        continuesUsed = 0;
        levelsStarted = 0;
@@ -221,12 +221,12 @@ void Game::totalUpStats()
 
 void Game::setStageName(const char *name)
 {
-       strncpy(stageName, name, sizeof stageName);
+       strlcpy(stageName, name, sizeof stageName);
 }
 
 void Game::setMapName(const char *name)
 {
-       strncpy(mapName, name, sizeof mapName);
+       strlcpy(mapName, name, sizeof mapName);
 }
 
 void Game::setMissionOver(int reason)