Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reflecting changes in crtdll.

Browse source 
svn path=/trunk/; revision=1659
This commit is contained in:
Carl Nettelblad 2001-03-03 13:28:28 +00:00
parent afe0e9f601
commit d5d8d819b8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/lib/msvcrt/stdlib/makepath.c
View file

@ -5,16 +5,18 @@ void _makepath( char *path, const char *drive, const char *dir, const char *fnam
{ {
int dir_len; int dir_len;
if ( drive != NULL ) { if ( drive != NULL ) {
strcat(path,drive); strcpy(path,drive);
strcat(path,":"); strcat(path,":");
} }
else
(*path)=0;
if ( dir != NULL ) { if ( dir != NULL ) {
strcat(path,dir); strcat(path,dir);
if ( *dir != '\\' ) if ( *dir != '\\' )
strcat(path,"\\"); strcat(path,"\\");
dir_len = strlen(dir); dir_len = strlen(dir);
if ( *(dir + dir_len - 1) != '\\' ) if (dir_len && *(dir + dir_len - 1) != '\\' )
strcat(path,"\\"); strcat(path,"\\");
} }
if ( fname != NULL ) { if ( fname != NULL ) {
@ -31,16 +33,18 @@ void _wmakepath( wchar_t *path, const wchar_t *drive, const wchar_t *dir, const
{ {
int dir_len; int dir_len;
if ( drive != NULL ) { if ( drive != NULL ) {
wcscat(path,drive); wcscpy(path,drive);
wcscat(path,L":"); wcscat(path,L":");
} }
else
(*path)=0;
if ( dir != NULL ) { if ( dir != NULL ) {
wcscat(path,dir); wcscat(path,dir);
if ( *dir != L'\\' ) if ( *dir != L'\\' )
wcscat(path,L"\\"); wcscat(path,L"\\");
dir_len = wcslen(dir); dir_len = wcslen(dir);
if ( *(dir + dir_len - 1) != L'\\' ) if ( dir_len && *(dir + dir_len - 1) != L'\\' )
wcscat(path,L"\\"); wcscat(path,L"\\");
} }
if ( fname != NULL ) { if ( fname != NULL ) {