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

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

diff --git a/src/title.cpp b/src/title.cpp
index b022cdb22394a6321b5b3769f71d18913c0551e6..c4e0619e740fe0621b9be09b2480cf8d2632980d 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -118,7 +118,7 @@ void setupSaveWidgets()
        for (int i = 0 ; i < 5 ; i++)
        {
                snprintf(widgetName, sizeof widgetName, "save%d", i + 1);
-               strncpy(engine.getWidgetByName(widgetName)->label, engine.saveSlot[i], sizeof engine.getWidgetByName(widgetName)->label);
+               strlcpy(engine.getWidgetByName(widgetName)->label, engine.saveSlot[i], sizeof engine.getWidgetByName(widgetName)->label);
                
                if ((strstr(engine.saveSlot[i], _("Empty"))) || (strstr(engine.saveSlot[i], _("Corrupt"))))
                {
@@ -126,7 +126,7 @@ void setupSaveWidgets()
                }
                
                snprintf(widgetName, sizeof widgetName, "slot%d", i + 1);
-               strncpy(engine.getWidgetByName(widgetName)->label, engine.saveSlot[i], sizeof engine.getWidgetByName(widgetName)->label);
+               strlcpy(engine.getWidgetByName(widgetName)->label, engine.saveSlot[i], sizeof engine.getWidgetByName(widgetName)->label);
        }
 }
 
@@ -145,7 +145,7 @@ void loadTitleWidgets()
        setupSaveWidgets();
        
        Widget *widget = engine.getWidgetByName("labelManual");
-       strncpy(widget->label, GAMEPLAYMANUAL, sizeof widget->label);
+       strlcpy(widget->label, GAMEPLAYMANUAL, sizeof widget->label);
 
        showTitleWidgets();
 }