#include <unistd.h>
#include "plugin.h"
+#include "pcnt.h"
#include "../gui/Linux.h"
#include "../libpcsxcore/misc.h"
int UseGui;
+static char *(*real_getenv)(const char *name);
static void make_path(char *buf, size_t size, const char *dir, const char *fname)
{
char path[MAXPATHLEN];
int runcd = 0;
int loadst = 0;
+ void *tmp;
int i;
+ tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
+ if (tmp == NULL)
+ tmp = dlopen("/lib32/libdl.so.2", RTLD_LAZY);
+ if (tmp != NULL)
+ real_getenv = dlsym(tmp, "getenv");
+ if (real_getenv == NULL) {
+ fprintf(stderr, "%s\n", dlerror());
+ return 1;
+ }
+ dlclose(tmp);
+
// what is the name of the config file?
// it may be redefined by -cfg on the command line
strcpy(cfgfile_basename, "pcsx.cfg");
emuLog = stdout;
SetIsoFile(NULL);
- Config.PsxOut = 1;
// read command line options
for (i = 1; i < argc; i++) {
SysMessage("Failed loading plugins!");
return 1;
}
+ pcnt_hook_plugins();
if (OpenPlugins() == -1) {
return 1;
if (loadst) {
StatesC = loadst - 1;
char *state_filename = get_state_filename(StatesC);
- LoadState(state_filename);
+ int ret = LoadState(state_filename);
+ printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename);
free(state_filename);
}
vsprintf(msg, fmt, list);
va_end(list);
- if (Config.PsxOut) {
- static char linestart = 1;
- int l = strlen(msg);
-
- printf(linestart ? " * %s" : "%s", msg);
-
- if (l > 0 && msg[l - 1] == '\n') {
- linestart = 1;
- } else {
- linestart = 0;
- }
- }
-
fprintf(emuLog, "%s", msg);
}
{
static char ret[8] = ".";
- // HACK
- if (name && strcmp(name, "DISPLAY") == 0)
- return ":0";
-
- if (name && strcmp(name, "HOME") != 0)
- fprintf(stderr, "getenv called with %s\n", name);
+ if (name && strcmp(name, "HOME") == 0)
+ return ret;
- return ret;
+ return real_getenv(name);
}
#endif