notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: small debug improvement
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
6ee0b2f
..
fd1c119
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-14,10
+14,12
@@
#include <unistd.h>
#include "plugin.h"
#include <unistd.h>
#include "plugin.h"
+#include "pcnt.h"
#include "../gui/Linux.h"
#include "../libpcsxcore/misc.h"
int UseGui;
#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)
{
static void make_path(char *buf, size_t size, const char *dir, const char *fname)
{
@@
-67,15
+69,24
@@
int main(int argc, char *argv[])
char path[MAXPATHLEN];
int runcd = 0;
int loadst = 0;
char path[MAXPATHLEN];
int runcd = 0;
int loadst = 0;
+ void *tmp;
int i;
int i;
+ tmp = dlopen("/lib/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);
// 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++) {
// read command line options
for (i = 1; i < argc; i++) {
@@
-181,6
+192,7
@@
int main(int argc, char *argv[])
SysMessage("Failed loading plugins!");
return 1;
}
SysMessage("Failed loading plugins!");
return 1;
}
+ pcnt_hook_plugins();
if (OpenPlugins() == -1) {
return 1;
if (OpenPlugins() == -1) {
return 1;
@@
-340,19
+352,6
@@
void SysPrintf(const char *fmt, ...) {
vsprintf(msg, fmt, list);
va_end(list);
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);
}
fprintf(emuLog, "%s", msg);
}
@@
-376,14
+375,10
@@
char *getenv(const char *name)
{
static char ret[8] = ".";
{
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 re
t
;
+ return re
al_getenv(name)
;
}
#endif
}
#endif