Marcus Meissner : msvcrt: _makepath(): operate on target buffer
directly.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 17 09:29:52 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 71908c41c38c188260dd8bfdb33d29b39421fa34
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71908c41c38c188260dd8bfdb33d29b39421fa34
Author: Marcus Meissner <meissner at suse.de>
Date: Tue Jan 17 16:20:37 2006 +0100
msvcrt: _makepath(): operate on target buffer directly.
---
dlls/msvcrt/dir.c | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index fa757ac..926d5dd 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -857,40 +857,37 @@ VOID _makepath(char * path, const char *
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);
}
More information about the wine-cvs
mailing list