From 39c4466db073639e48fe354f5de1d73c3fb46f44 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Fri, 16 Feb 2018 09:50:56 +0100 Subject: [PATCH] use sprintf(xxx,"%s%s...", x, y ..) for string concatenation --- src/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/init.c b/src/init.c index eae6b544..0be5b18c 100644 --- a/src/init.c +++ b/src/init.c @@ -676,9 +676,7 @@ T_Gui_skin * Load_graphics(const char * skin_file, T_Gradient_array *gradients) } // Read the "skin" file - strcpy(filename,Data_directory); - strcat(filename,SKINS_SUBDIRECTORY PATH_SEPARATOR); - strcat(filename,skin_file); + snprintf(filename, sizeof(filename), "%s%s%s%s", Data_directory,SKINS_SUBDIRECTORY, PATH_SEPARATOR, skin_file); gui=Load_surface(filename, gradients); if (!gui) @@ -765,7 +763,7 @@ byte * Load_font(const char * font_name, int is_main) } // Read the file containing the image - sprintf(filename,"%s" SKINS_SUBDIRECTORY "%s%s", Data_directory, PATH_SEPARATOR, font_name); + snprintf(filename, sizeof(filename), "%s%s%s%s", Data_directory, SKINS_SUBDIRECTORY, PATH_SEPARATOR, font_name); image=Load_surface(filename, NULL); if (!image) @@ -808,7 +806,7 @@ void Load_Unicode_fonts(void) { char directory[MAX_PATH_CHARACTERS]; - snprintf(directory,sizeof(directory), "%s" SKINS_SUBDIRECTORY, Data_directory); + snprintf(directory,sizeof(directory), "%s%s", Data_directory, SKINS_SUBDIRECTORY); For_each_file(directory, Load_Unicode_font); }