#include "porting.h"
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <sys/types.h>
#include <sys/sysctl.h>
#elif defined(_WIN32)
+ #include <windows.h>
+ #include <wincrypt.h>
#include <algorithm>
#endif
#if !defined(_WIN32)
#define _PSTAT64
#include <sys/pstat.h>
#endif
-#if !defined(_WIN32) && !defined(__APPLE__) && \
- !defined(__ANDROID__) && !defined(SERVER)
- #define XORG_USED
-#endif
-#ifdef XORG_USED
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-#endif
#include "config.h"
#include "debug.h"
#if !defined(_WIN32) // POSIX
#include <signal.h>
-void sigint_handler(int sig)
+void signal_handler(int sig)
{
- if(!g_killed) {
- dstream<<DTIME<<"INFO: sigint_handler(): "
- <<"Ctrl-C pressed, shutting down."<<std::endl;
+ if (!g_killed) {
+ if (sig == SIGINT) {
+ dstream << "INFO: signal_handler(): "
+ << "Ctrl-C pressed, shutting down." << std::endl;
+ } else if (sig == SIGTERM) {
+ dstream << "INFO: signal_handler(): "
+ << "got SIGTERM, shutting down." << std::endl;
+ }
// Comment out for less clutter when testing scripts
- /*dstream<<DTIME<<"INFO: sigint_handler(): "
- <<"Printing debug stacks"<<std::endl;
+ /*dstream << "INFO: sigint_handler(): "
+ << "Printing debug stacks" << std::endl;
debug_stacks_print();*/
g_killed = true;
} else {
- (void)signal(SIGINT, SIG_DFL);
+ (void)signal(sig, SIG_DFL);
}
}
void signal_handler_init(void)
{
- (void)signal(SIGINT, sigint_handler);
+ (void)signal(SIGINT, signal_handler);
+ (void)signal(SIGTERM, signal_handler);
}
#else // _WIN32
case CTRL_CLOSE_EVENT:
case CTRL_LOGOFF_EVENT:
case CTRL_SHUTDOWN_EVENT:
- if (g_killed == false) {
- dstream << DTIME << "INFO: event_handler(): "
+ if (!g_killed) {
+ dstream << "INFO: event_handler(): "
<< "Ctrl+C, Close Event, Logoff Event or Shutdown Event,"
" shutting down." << std::endl;
g_killed = true;
// Default to RUN_IN_PLACE style relative paths
std::string path_share = "..";
std::string path_user = "..";
+std::string path_locale = path_share + DIR_DELIM + "locale";
+std::string path_cache = path_user + DIR_DELIM + "cache";
+
std::string getDataPath(const char *subpath)
{
{
const char *ends[] = {
"bin\\Release",
+ "bin\\MinSizeRel",
+ "bin\\RelWithDebInfo",
"bin\\Debug",
"bin\\Build",
NULL
//// Linux
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(__linux__)
bool getCurrentExecPath(char *buf, size_t len)
{
//// Linux
-#elif defined(linux) || defined(__linux)
+#elif defined(__linux__)
bool setSystemPaths()
{
#endif
for (std::list<std::string>::const_iterator
- i = trylist.begin(); i != trylist.end(); i++) {
+ i = trylist.begin(); i != trylist.end(); ++i) {
const std::string &trypath = *i;
if (!fs::PathExists(trypath) ||
!fs::PathExists(trypath + DIR_DELIM + "builtin")) {
- dstream << "WARNING: system-wide share not found at \""
+ warningstream << "system-wide share not found at \""
<< trypath << "\""<< std::endl;
continue;
}
// Warn if was not the first alternative
if (i != trylist.begin()) {
- dstream << "WARNING: system-wide share found at \""
+ warningstream << "system-wide share found at \""
<< trypath << "\"" << std::endl;
}
TRUE, (UInt8 *)path, PATH_MAX)) {
path_share = std::string(path);
} else {
- dstream << "WARNING: Could not determine bundle resource path" << std::endl;
+ warningstream << "Could not determine bundle resource path" << std::endl;
}
CFRelease(resources_url);
#endif
+void migrateCachePath()
+{
+ const std::string local_cache_path = path_user + DIR_DELIM + "cache";
+
+ // Delete tmp folder if it exists (it only ever contained
+ // a temporary ogg file, which is no longer used).
+ if (fs::PathExists(local_cache_path + DIR_DELIM + "tmp"))
+ fs::RecursiveDelete(local_cache_path + DIR_DELIM + "tmp");
+
+ // Bail if migration impossible
+ if (path_cache == local_cache_path || !fs::PathExists(local_cache_path)
+ || fs::PathExists(path_cache)) {
+ return;
+ }
+ if (!fs::Rename(local_cache_path, path_cache)) {
+ errorstream << "Failed to migrate local cache path "
+ "to system path!" << std::endl;
+ }
+}
void initializePaths()
{
path_share = execpath;
path_user = execpath;
}
-
+ path_cache = path_user + DIR_DELIM + "cache";
#else
infostream << "Using system-wide paths (NOT RUN_IN_PLACE)" << std::endl;
if (!setSystemPaths())
errorstream << "Failed to get one or more system-wide path" << std::endl;
+ // Initialize path_cache
+ // First try $XDG_CACHE_HOME/PROJECT_NAME
+ const char *cache_dir = getenv("XDG_CACHE_HOME");
+ const char *home_dir = getenv("HOME");
+ if (cache_dir) {
+ path_cache = std::string(cache_dir) + DIR_DELIM + PROJECT_NAME;
+ } else if (home_dir) {
+ // Then try $HOME/.cache/PROJECT_NAME
+ path_cache = std::string(home_dir) + DIR_DELIM + ".cache"
+ + DIR_DELIM + PROJECT_NAME;
+ } else {
+ // If neither works, use $PATH_USER/cache
+ path_cache = path_user + DIR_DELIM + "cache";
+ }
+ // Migrate cache folder to new location if possible
+ migrateCachePath();
#endif
infostream << "Detected share path: " << path_share << std::endl;
infostream << "Detected user path: " << path_user << std::endl;
+ infostream << "Detected cache path: " << path_cache << std::endl;
+
+#if USE_GETTEXT
+ bool found_localedir = false;
+# ifdef STATIC_LOCALEDIR
+ if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) {
+ found_localedir = true;
+ path_locale = STATIC_LOCALEDIR;
+ infostream << "Using locale directory " << STATIC_LOCALEDIR << std::endl;
+ } else {
+ path_locale = getDataPath("locale");
+ if (fs::PathExists(path_locale)) {
+ found_localedir = true;
+ infostream << "Using in-place locale directory " << path_locale
+ << " even though a static one was provided "
+ << "(RUN_IN_PLACE or CUSTOM_LOCALEDIR)." << std::endl;
+ }
+ }
+# else
+ path_locale = getDataPath("locale");
+ if (fs::PathExists(path_locale)) {
+ found_localedir = true;
+ }
+# endif
+ if (!found_localedir) {
+ warningstream << "Couldn't find a locale directory!" << std::endl;
+ }
+#endif // USE_GETTEXT
}
-
-
-void setXorgClassHint(const video::SExposedVideoData &video_data,
- const std::string &name)
-{
-#ifdef XORG_USED
- if (video_data.OpenGLLinux.X11Display == NULL)
- return;
-
- XClassHint *classhint = XAllocClassHint();
- classhint->res_name = (char *)name.c_str();
- classhint->res_class = (char *)name.c_str();
-
- XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
- video_data.OpenGLLinux.X11Window, classhint);
- XFree(classhint);
-#endif
-}
-
-
////
-//// Video/Display Information (Client-only)
+//// OS-specific Secure Random
////
-#ifndef SERVER
-
-static irr::IrrlichtDevice *device;
-
-void initIrrlicht(irr::IrrlichtDevice *device_)
-{
- device = device_;
-}
-
-v2u32 getWindowSize()
-{
- return device->getVideoDriver()->getScreenSize();
-}
-
+#ifdef WIN32
-std::vector<core::vector3d<u32> > getSupportedVideoModes()
+bool secure_rand_fill_buf(void *buf, size_t len)
{
- IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
- sanity_check(nulldevice != NULL);
+ HCRYPTPROV wctx;
- std::vector<core::vector3d<u32> > mlist;
- video::IVideoModeList *modelist = nulldevice->getVideoModeList();
-
- u32 num_modes = modelist->getVideoModeCount();
- for (u32 i = 0; i != num_modes; i++) {
- core::dimension2d<u32> mode_res = modelist->getVideoModeResolution(i);
- s32 mode_depth = modelist->getVideoModeDepth(i);
- mlist.push_back(core::vector3d<u32>(mode_res.Width, mode_res.Height, mode_depth));
- }
-
- nulldevice->drop();
+ if (!CryptAcquireContext(&wctx, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+ return false;
- return mlist;
+ CryptGenRandom(wctx, len, (BYTE *)buf);
+ CryptReleaseContext(wctx, 0);
+ return true;
}
-std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers()
-{
- std::vector<irr::video::E_DRIVER_TYPE> drivers;
-
- for (int i = 0; i != irr::video::EDT_COUNT; i++) {
- if (irr::IrrlichtDevice::isDriverSupported((irr::video::E_DRIVER_TYPE)i))
- drivers.push_back((irr::video::E_DRIVER_TYPE)i);
- }
-
- return drivers;
-}
+#else
-const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type)
+bool secure_rand_fill_buf(void *buf, size_t len)
{
- static const char *driver_ids[] = {
- "null",
- "software",
- "burningsvideo",
- "direct3d8",
- "direct3d9",
- "opengl",
- "ogles1",
- "ogles2",
- };
-
- return driver_ids[type];
-}
-
+ // N.B. This function checks *only* for /dev/urandom, because on most
+ // common OSes it is non-blocking, whereas /dev/random is blocking, and it
+ // is exceptionally uncommon for there to be a situation where /dev/random
+ // exists but /dev/urandom does not. This guesswork is necessary since
+ // random devices are not covered by any POSIX standard...
+ FILE *fp = fopen("/dev/urandom", "rb");
+ if (!fp)
+ return false;
-const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
-{
- static const char *driver_names[] = {
- "NULL Driver",
- "Software Renderer",
- "Burning's Video",
- "Direct3D 8",
- "Direct3D 9",
- "OpenGL",
- "OpenGL ES1",
- "OpenGL ES2",
- };
+ bool success = fread(buf, len, 1, fp) == 1;
- return driver_names[type];
+ fclose(fp);
+ return success;
}
-# ifndef __ANDROID__
-# ifdef XORG_USED
+#endif
-static float calcDisplayDensity()
+void attachOrCreateConsole(void)
{
- const char *current_display = getenv("DISPLAY");
-
- if (current_display != NULL) {
- Display *x11display = XOpenDisplay(current_display);
-
- if (x11display != NULL) {
- /* try x direct */
- float dpi_height = floor(DisplayHeight(x11display, 0) /
- (DisplayHeightMM(x11display, 0) * 0.039370) + 0.5);
- float dpi_width = floor(DisplayWidth(x11display, 0) /
- (DisplayWidthMM(x11display, 0) * 0.039370) + 0.5);
-
- XCloseDisplay(x11display);
-
- return std::max(dpi_height,dpi_width) / 96.0;
- }
+#ifdef _WIN32
+ static bool consoleAllocated = false;
+ const bool redirected = (_fileno(stdout) == -2 || _fileno(stdout) == -1); // If output is redirected to e.g a file
+ if (!consoleAllocated && redirected && (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())) {
+ freopen("CONOUT$", "w", stdout);
+ freopen("CONOUT$", "w", stderr);
+ consoleAllocated = true;
}
-
- /* return manually specified dpi */
- return g_settings->getFloat("screen_dpi")/96.0;
-}
-
-
-float getDisplayDensity()
-{
- static float cached_display_density = calcDisplayDensity();
- return cached_display_density;
+#endif
}
+// Load performance counter frequency only once at startup
+#ifdef _WIN32
-# else // XORG_USED
-float getDisplayDensity()
+inline double get_perf_freq()
{
- return g_settings->getFloat("screen_dpi")/96.0;
+ LARGE_INTEGER freq;
+ QueryPerformanceFrequency(&freq);
+ return freq.QuadPart;
}
-# endif // XORG_USED
-v2u32 getDisplaySize()
-{
- IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
+double perf_freq = get_perf_freq();
- core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();
- nulldevice -> drop();
-
- return deskres;
-}
-# endif // __ANDROID__
-#endif // SERVER
+#endif
} //namespace porting
-
projects / minetest.git / blobdiff