system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

msvcrt: _makepath(): operate on target buffer directly.

Browse source
This commit is contained in:
Marcus Meissner 2006-01-17 16:20:37 +01:00 committed by Alexandre Julliard
parent c82a63ba97
commit 71908c41c3
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dlls/msvcrt/dir.c
View file

@ -857,40 +857,37 @@ VOID _makepath(char * path, const char * drive,
const char * extension)
{
char ch;
char tmpPath[MAX_PATH];
TRACE("got %s %s %s %s\n", debugstr_a(drive), debugstr_a(directory),
TRACE("(%s %s %s %s)\n", debugstr_a(drive), debugstr_a(directory),
debugstr_a(filename), debugstr_a(extension) );
if ( !path )
return;
tmpPath[0] = '\0';
path[0] = '\0';
if (drive && drive[0])
{
tmpPath[0] = drive[0];
tmpPath[1] = ':';
tmpPath[2] = 0;
path[0] = drive[0];
path[1] = ':';
path[2] = 0;
}
if (directory && directory[0])
{
strcat(tmpPath, directory);
ch = tmpPath[strlen(tmpPath)-1];
strcat(path, directory);
ch = path[strlen(path)-1];
if (ch != '/' && ch != '\\')
strcat(tmpPath,"\\");
strcat(path,"\\");
}
if (filename && filename[0])
{
strcat(tmpPath, filename);
strcat(path, filename);
if (extension && extension[0])
{
if ( extension[0] != '.' )
strcat(tmpPath,".");
strcat(tmpPath,extension);
strcat(path,".");
strcat(path,extension);
}
}
strcpy( path, tmpPath );
TRACE("returning %s\n",path);
}