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

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

diff --git a/src/hub.cpp b/src/hub.cpp
index bcfe2e15ef3e61dc5f3ae0644cc503fcf13c3dfa..4233fa98cdd2887322a621f8937f28b766f505fc 100644 (file)
--- a/src/hub.cpp
+++ b/src/hub.cpp
@@ -280,7 +280,7 @@ void createObjectivesPanel(const char *levelName)
                                }
                                else
                                {
-                                       strncpy(string, _(data->value), sizeof string);
+                                       strlcpy(string, _(data->value), sizeof string);
                                        
                                        if (strlen(string) >= 25)
                                        {
@@ -546,8 +546,8 @@ int doHub()
 
        int rtn = -1;
        
-       strncpy(level, "@none@", sizeof level);
-       strncpy(game.stageName, "@none@", sizeof game.stageName);
+       strlcpy(level, "@none@", sizeof level);
+       strlcpy(game.stageName, "@none@", sizeof game.stageName);
 
        bool showData = false;
        bool showStats = false;
@@ -576,7 +576,7 @@ int doHub()
        if ((numberOfHubs == 0) && (gameData.completedWorld))
        {
                game.setMapName("data/spaceStation");
-               strncpy(game.stageName, "Space Station", sizeof game.stageName);
+               strlcpy(game.stageName, "Space Station", sizeof game.stageName);
                createObjectivesPanel("Space Station");
                showData = true;
                showStats = showMIAs = false;