From b08c90ca63723536960122fc798f673af1faed13 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 16 Nov 2003 22:20:41 +0000 Subject: [PATCH] Modified wxGetHomeDir to take environment variable HOME into account. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/utils.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index 67e5fdad78..df321ea4e3 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -380,18 +380,24 @@ const wxChar* wxGetHomeDir( wxString& rStrDir = *pStr; // OS/2 has no idea about home, - // so use the working directory instead? + // so use the working directory instead. + // However, we might have a valid HOME directory, + // as is used on many machines that have unix utilities + // on them, so we should use that, if available. // 256 was taken from os2def.h #ifndef MAX_PATH # define MAX_PATH 256 #endif - char zDirName[256]; - ULONG ulDirLen; + const wxChar *szHome = wxGetenv("HOME"); + if ( szHome == NULL ) { + // we're homeless, use current directory. + rStrDir = wxT("."); + } + else + rStrDir = szHome; - ::DosQueryCurrentDir(0, zDirName, &ulDirLen); - rStrDir = zDirName; return rStrDir.c_str(); } -- 2.45.2