Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sstrcpy|sstrcat instead of strlcpy|strlcat for manipulation of statically sized strings 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5173 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-05-25 11:36:20 +00:00
parent 3c235cb99f
commit 030d5b455b
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/init.c
View File

@ -184,10 +184,10 @@ void registerSearchPath( const char path[], unsigned int priority )
{
wzSearchPath * curSearchPath = searchPathRegistry, * tmpSearchPath = NULL;
tmpSearchPath = (wzSearchPath*)malloc(sizeof(wzSearchPath));
strcpy( tmpSearchPath->path, path );
if( path[strlen(path)-1] != *PHYSFS_getDirSeparator() )
strcat( tmpSearchPath->path, PHYSFS_getDirSeparator() );
tmpSearchPath = (wzSearchPath*)malloc(sizeof(*tmpSearchPath));
sstrcpy(tmpSearchPath->path, path);
if (path[strlen(path)-1] != *PHYSFS_getDirSeparator())
sstrcat(tmpSearchPath->path, PHYSFS_getDirSeparator());
tmpSearchPath->priority = priority;
debug( LOG_WZ, "registerSearchPath: Registering %s at priority %i", path, priority );
@ -264,19 +264,19 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force )
removeSubdirs( curSearchPath->path, "mods/multiplay/autoload", NULL );
// Remove multiplay patches
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "mp", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "mp");
PHYSFS_removeFromSearchPath( tmpstr );
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "mp.wz", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "mp.wz");
PHYSFS_removeFromSearchPath( tmpstr );
// Remove base files
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "base", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "base");
PHYSFS_removeFromSearchPath( tmpstr );
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "base.wz", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "base.wz");
PHYSFS_removeFromSearchPath( tmpstr );
curSearchPath = curSearchPath->higherPriority;
@ -300,11 +300,11 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force )
PHYSFS_removeFromSearchPath( curSearchPath->path );
// Add base files
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "base", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "base");
PHYSFS_addToSearchPath( tmpstr, PHYSFS_APPEND );
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "base.wz", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "base.wz");
PHYSFS_addToSearchPath( tmpstr, PHYSFS_APPEND );
curSearchPath = curSearchPath->higherPriority;
@ -328,19 +328,19 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force )
PHYSFS_removeFromSearchPath( curSearchPath->path );
// Add multiplay patches
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "mp", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "mp");
PHYSFS_addToSearchPath( tmpstr, PHYSFS_APPEND );
strlcpy( tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat( tmpstr, "mp.wz", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "mp.wz");
PHYSFS_addToSearchPath( tmpstr, PHYSFS_APPEND );
// Add base files
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "base", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "base");
PHYSFS_addToSearchPath( tmpstr, PHYSFS_APPEND );
strlcpy(tmpstr, curSearchPath->path, sizeof(tmpstr));
strlcat(tmpstr, "base.wz", sizeof(tmpstr));
sstrcpy(tmpstr, curSearchPath->path);
sstrcat(tmpstr, "base.wz");
PHYSFS_addToSearchPath( tmpstr, PHYSFS_APPEND );
curSearchPath = curSearchPath->higherPriority;