#include "wx/utils.h"
#ifndef WX_PRECOMP
- #include "wx/app.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/os2/private.h"
#include "wx/apptrait.h"
+#include "wx/filename.h"
#include <ctype.h>
#ifdef __EMX__
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
,(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;
#ifdef USE_NET_API
wxGetUserId( zBuf, nMaxSize );
#else
- wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);
+ wxStrlcpy(zBuf, _T("Unknown User"), nMaxSize);
#endif
return true;
}
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;
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;
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 )
#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
)
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;
}
return strVer;
}
+bool wxIsPlatform64Bit()
+{
+ // FIXME: No idea how to test for 64 bit processor
+ // (Probably irrelevant anyhow, though).
+ return false;
+}
+
void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
{
}
{
}
-wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{
- static wxToolkitInfo vInfo;
- ULONG ulSysInfo[QSV_MAX] = {0};
+ ULONG ulSysInfo = 0;
APIRET ulrc;
- vInfo.name = _T("wxBase");
- 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)
{
- vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10;
- vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR];
+ if ( verMaj )
+ *verMaj = ulSysInfo / 10;
+ if ( verMin )
+ *verMin = ulSysInfo % 10;
}
- vInfo.os = wxOS2_PM;
- return vInfo;
+
+ return wxOS_OS2;
}
+
// ---------------------------------------------------------------------------
const wxChar* wxGetHomeDir(
wxString* pStr
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;
projects / wxWidgets.git / blobdiff