X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cc49137de16a09ca3f99d3476ee972e19be3e9f..437a8892a107139e9f808f0a11792a56a55b4e25:/src/os2/utils.cpp diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index 66db9ff3f3..5a03ba30f3 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -21,6 +21,7 @@ #include "wx/os2/private.h" #include "wx/apptrait.h" +#include "wx/filename.h" #include #ifdef __EMX__ @@ -82,7 +83,8 @@ bool wxGetHostName( wxChar* zBuf, int nMaxSize ) wxChar* zSysname; const wxChar* zDefaultHost = _T("noname"); - if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL) + if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL && + (zSysname = wxGetenv(_T("HOSTNAME"))) == NULL) { ::PrfQueryProfileString( HINI_PROFILE ,(PSZ)WX_SECTION @@ -91,13 +93,12 @@ bool wxGetHostName( wxChar* zBuf, int nMaxSize ) ,(void*)zBuf ,(ULONG)nMaxSize - 1 ); + zBuf[nMaxSize] = _T('\0'); } else { - wxStrncpy(zBuf, zSysname, nMaxSize - 1); + wxStrlcpy(zBuf, zSysname, nMaxSize); } - - zBuf[nMaxSize] = _T('\0'); #endif return *zBuf ? true : false; @@ -119,7 +120,7 @@ bool wxGetUserName( wxChar* zBuf, int nMaxSize ) #ifdef USE_NET_API wxGetUserId( zBuf, nMaxSize ); #else - wxStrncpy(zBuf, _T("Unknown User"), nMaxSize); + wxStrlcpy(zBuf, _T("Unknown User"), nMaxSize); #endif return true; } @@ -155,7 +156,7 @@ bool wxShell( const wxString& rCommand ) SData.PgmName = (char*)zShell; sInputs = _T("/C ") + rCommand; - SData.PgmInputs = (BYTE*)sInputs.c_str(); + SData.PgmInputs = (BYTE*)sInputs.wx_str(); SData.TermQ = 0; SData.Environment = 0; SData.InheritOpt = SSF_INHERTOPT_SHELL; @@ -224,7 +225,7 @@ unsigned long wxGetProcessId() bool wxGetEnv(const wxString& var, wxString *value) { // wxGetenv is defined as getenv() - wxChar *p = wxGetenv(var); + wxChar *p = wxGetenv((const wxChar *)var); if ( !p ) return false; @@ -236,11 +237,18 @@ bool wxGetEnv(const wxString& var, wxString *value) return true; } -bool wxSetEnv(const wxString& variable, const wxChar *value) +static bool wxDoSetEnv(const wxString& variable, const char *value) { #if defined(HAVE_SETENV) - return setenv(variable.mb_str(), value ? wxString(value).mb_str().data() - : NULL, 1 /* overwrite */) == 0; + if ( !value ) + { +#ifdef HAVE_UNSETENV + return unsetenv(variable.mb_str()) == 0; +#else + value = _T(""); // mustn't pass NULL to setenv() +#endif + } + return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0; #elif defined(HAVE_PUTENV) wxString s = variable; if ( value ) @@ -261,6 +269,16 @@ bool wxSetEnv(const wxString& variable, const wxChar *value) #endif } +bool wxSetEnv(const wxString& variable, const wxString& value) +{ + return wxDoSetEnv(variable, value.mb_str()); +} + +bool wxUnsetEnv(const wxString& variable) +{ + return wxDoSetEnv(variable, NULL); +} + void wxMilliSleep( unsigned long ulMilliseconds ) @@ -297,19 +315,18 @@ void wxBell() wxString wxGetOsDescription() { wxString strVer(_T("OS/2")); - ULONG ulSysInfo[QSV_MAX] = {0}; + ULONG ulSysInfo = 0; - if (::DosQuerySysInfo( 1L, - QSV_MAX, - (PVOID)ulSysInfo, - sizeof(ULONG) * QSV_MAX + if (::DosQuerySysInfo( QSV_VERSION_MINOR, + QSV_VERSION_MINOR, + (PVOID)&ulSysInfo, + sizeof(ULONG) ) == 0L ) { wxString ver; - ver.Printf( _T(" ver. %d.%d rev. %c"), - int(ulSysInfo[QSV_VERSION_MAJOR] / 10), - int(ulSysInfo[QSV_VERSION_MINOR]), - char(ulSysInfo[QSV_VERSION_REVISION]) + ver.Printf( _T(" ver. %d.%d"), + int(ulSysInfo / 10), + int(ulSysInfo % 10) ); strVer += ver; } @@ -334,21 +351,21 @@ void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab)) wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) { - ULONG ulSysInfo[QSV_MAX] = {0}; + ULONG ulSysInfo = 0; APIRET ulrc; - ulrc = ::DosQuerySysInfo( 1L - ,QSV_MAX - ,(PVOID)ulSysInfo - ,sizeof(ULONG) * QSV_MAX + ulrc = ::DosQuerySysInfo( QSV_VERSION_MINOR, + QSV_VERSION_MINOR, + (PVOID)&ulSysInfo, + sizeof(ULONG) ); if (ulrc == 0L) { if ( verMaj ) - *verMaj = ulSysInfo[QSV_VERSION_MAJOR] / 10; + *verMaj = ulSysInfo / 10; if ( verMin ) - *verMin = ulSysInfo[QSV_VERSION_MINOR]; + *verMin = ulSysInfo % 10; } return wxOS_OS2; @@ -384,61 +401,92 @@ const wxChar* wxGetHomeDir( return rStrDir.c_str(); } -// Hack for OS/2 -#if wxUSE_UNICODE -const wxMB2WXbuf wxGetUserHome( const wxString &rUser ) -#else // just for binary compatibility -- there is no 'const' here -wxChar* wxGetUserHome ( const wxString &rUser ) -#endif +wxString wxGetUserHome ( const wxString &rUser ) { wxChar* zHome; - wxString sUser1(rUser); + wxString sUser(rUser); + + wxString home; - wxChar *wxBuffer = new wxChar[256]; #ifndef __EMX__ - if (!sUser1.empty()) + if (!sUser.empty()) { - wxChar zTmp[64]; + const wxString currentUser = wxGetUserId(); - if (wxGetUserId( zTmp - ,sizeof(zTmp)/sizeof(char) - )) + // Guests belong in the temp dir + if ( currentUser == "annonymous" ) { - // Guests belong in the temp dir - if (wxStricmp(zTmp, _T("annonymous")) == 0) - { - if ((zHome = wxGetenv(_T("TMP"))) != NULL || - (zHome = wxGetenv(_T("TMPDIR"))) != NULL || - (zHome = wxGetenv(_T("TEMP"))) != NULL) - delete[] wxBuffer; - return *zHome ? zHome : (wxChar*)_T("\\"); - } - if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0) - sUser1 = wxEmptyString; + zHome = wxGetenv(_T("TMP")); + if ( !zHome ) + zHome = wxGetenv(_T("TMPDIR")); + if ( !zHome ) + zHome = wxGetenv(_T("TEMP")); + + if ( zHome && *zHome ) + return zHome; } + + if ( sUser == currentUser ) + sUser.clear(); } #endif - if (sUser1.empty()) + if (sUser.empty()) { if ((zHome = wxGetenv(_T("HOME"))) != NULL) { - wxStrcpy(wxBuffer, zHome); - wxUnix2DosFilename(wxBuffer); -#if wxUSE_UNICODE - wxWCharBuffer retBuffer (wxBuffer); - delete[] wxBuffer; - return retBuffer; -#else - wxStrcpy(zHome, wxBuffer); - delete[] wxBuffer; - return zHome; -#endif + home = zHome; + home.Replace("/", "\\"); } } - delete[] wxBuffer; - return (wxChar*)wxEmptyString; // No home known! + + return home; } +bool wxGetDiskSpace(const wxString& path, + wxDiskspaceSize_t *pTotal, + wxDiskspaceSize_t *pFree) +{ + if (path.empty()) + return false; + + wxFileName fn(path); + FSALLOCATE fsaBuf = {0}; + APIRET rc = NO_ERROR; + ULONG disknum = 0; + + fn.MakeAbsolute(); + + if (wxDirExists(fn.GetFullPath()) == false) + return false; + + disknum = wxToupper(fn.GetVolume().GetChar(0)) - _T('A') + 1; + + rc = ::DosQueryFSInfo(disknum, // 1 = A, 2 = B, 3 = C, ... + FSIL_ALLOC, // allocation info + (PVOID)&fsaBuf, + sizeof(FSALLOCATE)); + + if (rc != NO_ERROR) + return false; + else + { + if(pTotal) + { + // to try to avoid 32-bit overflow, let's not multiply right away + // (num of alloc units) + *pTotal = fsaBuf.cUnit; + // * (num of sectors per alloc unit) * (num of bytes per sector) + (*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector; + } + if(pFree) + { + *pFree = fsaBuf.cUnitAvail; + (*pFree) *= fsaBuf.cSectorUnit * fsaBuf.cbSector; + } + return true; + } +} + wxString wxPMErrorToStr(ERRORID vError) { wxString sError;