mirror of
https://github.com/fish-shell/fish-shell
synced 2024-09-22 15:31:58 +00:00
Bugfix in the wdirname function
darcs-hash:20060908141041-ac50b-8650eea2d071606654cad94553344ed12b4bf609.gz
This commit is contained in:
parent
45d2b89780
commit
eafa0a7169
2 changed files with 4 additions and 3 deletions
5
wutil.c
5
wutil.c
|
@ -404,7 +404,7 @@ wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
wchar_t *wdirname( const wchar_t *path )
|
wchar_t *wdirname( wchar_t *path )
|
||||||
{
|
{
|
||||||
static string_buffer_t *sb = 0;
|
static string_buffer_t *sb = 0;
|
||||||
if( sb )
|
if( sb )
|
||||||
|
@ -418,7 +418,8 @@ wchar_t *wdirname( const wchar_t *path )
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
sb_printf( sb, L"%s", narrow_res );
|
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 )
|
wchar_t *wbasename( const wchar_t *path )
|
||||||
|
|
2
wutil.h
2
wutil.h
|
@ -111,7 +111,7 @@ struct wdirent *wreaddir(DIR *dir );
|
||||||
/**
|
/**
|
||||||
Wide character version of dirname()
|
Wide character version of dirname()
|
||||||
*/
|
*/
|
||||||
wchar_t *wdirname( const wchar_t *path );
|
wchar_t *wdirname( wchar_t *path );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Wide character version of basename()
|
Wide character version of basename()
|
||||||
|
|
Loading…
Reference in a new issue