From 71908c41c38c188260dd8bfdb33d29b39421fa34 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 17 Jan 2006 16:20:37 +0100 Subject: [PATCH] msvcrt: _makepath(): operate on target buffer directly. --- dlls/msvcrt/dir.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index fa757acaf1f..926d5dd956f 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -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); }