From eafa0a7169379b20a014e729265dcedb433b8844 Mon Sep 17 00:00:00 2001 From: axel Date: Sat, 9 Sep 2006 00:10:41 +1000 Subject: [PATCH] Bugfix in the wdirname function darcs-hash:20060908141041-ac50b-8650eea2d071606654cad94553344ed12b4bf609.gz --- wutil.c | 5 +++-- wutil.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wutil.c b/wutil.c index 769f6da55..b939c10df 100644 --- a/wutil.c +++ b/wutil.c @@ -404,7 +404,7 @@ wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path) #endif -wchar_t *wdirname( const wchar_t *path ) +wchar_t *wdirname( wchar_t *path ) { static string_buffer_t *sb = 0; if( sb ) @@ -418,7 +418,8 @@ wchar_t *wdirname( const wchar_t *path ) return 0; sb_printf( sb, L"%s", narrow_res ); - return (wchar_t *)sb->buff; + wcscpy( path, (wchar_t *)sb->buff ); + return path; } wchar_t *wbasename( const wchar_t *path ) diff --git a/wutil.h b/wutil.h index da041f528..9a802ba11 100644 --- a/wutil.h +++ b/wutil.h @@ -111,7 +111,7 @@ struct wdirent *wreaddir(DIR *dir ); /** Wide character version of dirname() */ -wchar_t *wdirname( const wchar_t *path ); +wchar_t *wdirname( wchar_t *path ); /** Wide character version of basename()