enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix some env vars to use namespacing 

SVN revision: 24930
This commit is contained in:
Carsten Haitzler 2006-08-20 08:22:19 +00:00
parent 90c133e32f
commit 683366ce0e
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_config.c
View File

@ -45,7 +45,7 @@ static E_Config_DD *_e_config_shelf_edd = NULL;
EAPI int
e_config_init(void)
{
_e_config_profile = getenv("CONF_PROFILE");
_e_config_profile = getenv("E_CONF_PROFILE");
if (!_e_config_profile)
{
Eet_File *ef;

20
src/bin/e_main.c
View File

@ -95,8 +95,8 @@ main(int argc, char **argv)
sigaction(SIGABRT, &action, NULL);
t = ecore_time_get();
s = getenv("START_TIME");
if ((s) && (getenv("CRASHED")))
s = getenv("E_START_TIME");
if ((s) && (!getenv("E_RESTART_OK")))
{
tstart = atof(s);
if ((t - tstart) < 5.0)
@ -104,11 +104,10 @@ main(int argc, char **argv)
safe_mode = 1;
}
}
e_util_env_set("CRASHED", NULL);
tstart = t;
snprintf(buf, sizeof(buf), "%1.1f", tstart);
e_util_env_set("START_TIME", buf);
e_util_env_set("E_START_TIME", buf);
/* FIXME: this is the init code for letting e be relocatable. right now
* its not used - so i want to see if it can reliably determine its exe
@ -159,12 +158,12 @@ main(int argc, char **argv)
/* for debugging by redirecting stdout of e to a log file to tail */
setvbuf(stdout, NULL, _IONBF, 0);
if (getenv("NOSTARTUP")) nostartup = 1;
if (getenv("RESTART")) after_restart = 1;
if (getenv("E_RESTART")) after_restart = 1;
if (getenv("DESKTOP_STARTUP_ID")) e_util_env_set("DESKTOP_STARTUP_ID", NULL);
e_util_env_set("RESTART", "1");
e_util_env_set("E_RESTART_OK", NULL);
e_util_env_set("E_RESTART", "1");
/* envrionment varabiles so you know E is running/launched you */
e_util_env_set("PANTS", "ON");
@ -194,22 +193,24 @@ main(int argc, char **argv)
{
good = 1;
evil = 0;
printf("LA LA LA\n");
}
else if (!strcmp(argv[i], "-evil"))
{
good = 0;
evil = 1;
printf("MUHAHAHAHHAHAHAHAHA\n");
}
else if (!strcmp(argv[i], "-psychotic"))
{
good = 1;
evil = 1;
printf("MUHAHALALALALALALALA\n");
}
else if ((!strcmp(argv[i], "-profile")) && (i < (argc - 1)))
{
i++;
e_util_env_set("CONF_PROFILE", argv[i]);
e_util_env_set("E_CONF_PROFILE", argv[i]);
}
else if ((!strcmp(argv[i], "-h")) ||
(!strcmp(argv[i], "-help")) ||
@ -734,6 +735,7 @@ main(int argc, char **argv)
e_app_unmonitor_all();
e_ipc_shutdown();
ecore_file_shutdown();
e_util_env_set("E_RESTART_OK", "1");
ecore_app_restart();
}

6
src/bin/e_signals.c
View File

@ -25,7 +25,6 @@ e_sigseg_act(int x, siginfo_t *info, void *data)
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
e_util_env_set("CRASHED", "SEGV");
e_alert_show("This is very bad. Enlightenment has segfaulted.\n"
"This is not meant to happen and is likely a sign of a\n"
"bug in Enlightenment or the libraries it relies on.\n"
@ -51,7 +50,6 @@ e_sigseg_act(int x, siginfo_t *info, void *data)
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
e_util_env_set("CRASHED", "SEGV");
e_alert_show("This is very bad. Enlightenment has segfaulted.\n"
"This is not meant to happen and is likely a sign of a\n"
"bug in Enlightenment or the libraries it relies on.\n"
@ -78,7 +76,6 @@ e_sigill_act(int x, siginfo_t *info, void *data)
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
e_util_env_set("CRASHED", "ILL");
e_alert_show("This is very bad. Enlightenment has executed and illegal\n"
"instruction. This is most likely because Enlightenment or\n"
"a library it depends on has been compiled for a CPU type\n"
@ -105,7 +102,6 @@ e_sigfpe_act(int x, siginfo_t *info, void *data)
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
e_util_env_set("CRASHED", "FPE");
e_alert_show("This is very bad. Enlightenment has recieved a floating\n"
"point exception. This is probably due to a divide by 0\n"
"in Enlightenment or a library it depends on.\n"
@ -131,7 +127,6 @@ e_sigbus_act(int x, siginfo_t *info, void *data)
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
e_util_env_set("CRASHED", "BUS");
e_alert_show("This is very bad. Enlightenment has recieved a bus error.\n"
"This could be for many reasons - accessing memory not in\n"
"its available address space or unable to be paged in.\n"
@ -157,7 +152,6 @@ e_sigabrt_act(int x, siginfo_t *info, void *data)
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
e_util_env_set("CRASHED", "ABRT");
e_alert_show("This is very bad. Enlightenment has recieved an abort.\n"
"This could be for many reasons - accessing memory not in\n"
"its available address space or unable to be paged in.\n"