Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always return wxString from wxGetUserHome() instead of char */wxWCharBuffer depending on the build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-06 12:38:15 +00:00
parent 987bb1c66b
commit 14d6351382
8 changed files with 58 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/unix/utilsunx.cpp
View File

@@ -695,7 +695,7 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
const wxChar* wxGetHomeDir( wxString *home )
{
*home = wxGetUserHome( wxEmptyString );
*home = wxGetUserHome();
wxString tmp;
if ( home->empty() )
*home = wxT("/");
@@ -707,11 +707,7 @@ const wxChar* wxGetHomeDir( wxString *home )
return home->c_str();
}
#if wxUSE_UNICODE
const wxMB2WXbuf wxGetUserHome( const wxString &user )
#else // just for binary compatibility -- there is no 'const' here
char *wxGetUserHome( const wxString &user )
#endif
wxString wxGetUserHome( const wxString &user )
{
struct passwd *who = (struct passwd *) NULL;
@@ -721,20 +717,17 @@ char *wxGetUserHome( const wxString &user )
if ((ptr = wxGetenv(wxT("HOME"))) != NULL)
{
#if wxUSE_UNICODE
wxWCharBuffer buffer( ptr );
return buffer;
#else
return ptr;
#endif
}
if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
if ((ptr = wxGetenv(wxT("USER"))) != NULL ||
(ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
{
who = getpwnam(wxSafeConvertWX2MB(ptr));
}
// We now make sure the the user exists!
if (who == NULL)
// make sure the user exists!
if ( !who )
{
who = getpwuid(getuid());
}