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

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

diff --git a/src/main.cpp b/src/main.cpp
index 6d4e99f5c799b192e4de1aea73ad6f4f901148b9..bea1e30d4805e76f9511f53a5419b5ea23056304 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -126,8 +126,8 @@ int main(int argc, char *argv[])
                else if (strcmp(argv[i], "-mono") == 0) engine.useAudio = 1;
                else if (strcmp(argv[i], "-version") == 0) showVersion();
                else if (strcmp(argv[i], "--help") == 0) showHelp();
-               else if (strcmp(argv[i], "-record") == 0) {recordMode = REPLAY_MODE::RECORD; strncpy(replayData.filename, argv[++i], sizeof replayData.filename);}
-               else if (strcmp(argv[i], "-playback") == 0) {recordMode = REPLAY_MODE::PLAYBACK; strncpy(replayData.filename, argv[++i], sizeof replayData.filename);}
+               else if (strcmp(argv[i], "-record") == 0) {recordMode = REPLAY_MODE::RECORD; strlcpy(replayData.filename, argv[++i], sizeof replayData.filename);}
+               else if (strcmp(argv[i], "-playback") == 0) {recordMode = REPLAY_MODE::PLAYBACK; strlcpy(replayData.filename, argv[++i], sizeof replayData.filename);}
                else if (strcmp(argv[i], "-map") == 0) {game.setMapName(argv[++i]); requiredSection = SECTION_GAME;}
                else if (strcmp(argv[i], "-listmaps") == 0) listMaps();
                else if (strcmp(argv[i], "-credits") == 0) requiredSection = SECTION_CREDITS;
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
                        
                case REPLAY_MODE::RECORD:
                        requiredSection = SECTION_GAME;
-                       strncpy(replayData.header.map, game.mapName, sizeof replayData.header.map);
+                       strlcpy(replayData.header.map, game.mapName, sizeof replayData.header.map);
                        replayData.header.skill = game.skill = 3;
                        replayData.setMode(REPLAY_MODE::RECORD);
                        break;