Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/bin
Modified Files:
ef_data_dirs.c
Log Message:
- setup the environment between shutdown() and init() in case the init() stuff
access the env.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_data_dirs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ef_data_dirs.c 26 Mar 2007 16:31:10 -0000 1.2
+++ ef_data_dirs.c 26 Mar 2007 16:53:56 -0000 1.3
@@ -9,9 +9,8 @@
const char *tmp;
int ret = 1;
- putenv("XDG_DATA_HOME=/var/tmp");
-
efreet_shutdown();
+ setenv("XDG_DATA_HOME", "/var/tmp", 1);
efreet_init();
tmp = efreet_data_home_get();
@@ -24,11 +23,10 @@
/* reset efreet here so we can set a new home dir */
efreet_shutdown();
+ setenv("XDG_DATA_HOME", "", 1);
+ setenv("HOME", "/home/tmp", 1);
efreet_init();
- putenv("XDG_DATA_HOME=");
- putenv("HOME=/home/tmp");
-
tmp = efreet_data_home_get();
if (strcmp(tmp, "/home/tmp/.local/share"))
{
@@ -39,11 +37,10 @@
/* reset efreet here so we can set a new home dir */
efreet_shutdown();
+ setenv("XDG_DATA_HOME", "", 1);
+ setenv("HOME", "", 1);
efreet_init();
- putenv("XDG_DATA_HOME=");
- putenv("HOME=");
-
tmp = efreet_data_home_get();
if (strcmp(tmp, "/tmp/.local/share"))
{
@@ -61,9 +58,8 @@
const char *tmp;
int ret = 1;
- putenv("XDG_CONFIG_HOME=/var/tmp");
-
efreet_shutdown();
+ setenv("XDG_CONFIG_HOME", "/var/tmp", 1);
efreet_init();
tmp = efreet_config_home_get();
@@ -76,11 +72,10 @@
/* reset efreet here so we can set a new home dir */
efreet_shutdown();
+ setenv("XDG_CONFIG_HOME", "", 1);
+ setenv("HOME", "/home/tmp", 1);
efreet_init();
- putenv("XDG_CONFIG_HOME=");
- putenv("HOME=/home/tmp");
-
tmp = efreet_config_home_get();
if (strcmp(tmp, "/home/tmp/.config"))
{
@@ -91,11 +86,10 @@
/* reset efreet here so we can set a new home dir */
efreet_shutdown();
+ setenv("XDG_CONFIG_HOME", "", 1);
+ setenv("HOME", "", 1);
efreet_init();
- putenv("XDG_CONFIG_HOME=");
- putenv("HOME=");
-
tmp = efreet_config_home_get();
if (strcmp(tmp, "/tmp/.config"))
{
@@ -113,9 +107,8 @@
const char *tmp;
int ret = 1;
- putenv("XDG_CACHE_HOME=/var/tmp");
-
efreet_shutdown();
+ setenv("XDG_CACHE_HOME", "/var/tmp", 1);
efreet_init();
tmp = efreet_cache_home_get();
@@ -128,11 +121,10 @@
/* reset efreet here so we can set a new home dir */
efreet_shutdown();
+ setenv("XDG_CACHE_HOME", "", 1);
+ setenv("HOME", "/home/tmp", 1);
efreet_init();
- putenv("XDG_CACHE_HOME=");
- putenv("HOME=/home/tmp");
-
tmp = efreet_cache_home_get();
if (strcmp(tmp, "/home/tmp/.cache"))
{
@@ -143,11 +135,10 @@
/* reset efreet here so we can set a new home dir */
efreet_shutdown();
+ setenv("XDG_CACHE_HOME", "", 1);
+ setenv("HOME", "", 1);
efreet_init();
- putenv("XDG_CACHE_HOME=");
- putenv("HOME=");
-
tmp = efreet_cache_home_get();
if (strcmp(tmp, "/tmp/.cache"))
{
@@ -169,16 +160,14 @@
char *def_vals[] = {"/usr/local/share", "/usr/share", NULL};
dirs[0] = '\0';
- strcat(dirs, "XDG_DATA_DIRS=");
for (i = 0; vals[i] != NULL; i++)
{
if (i > 0) strcat(dirs, ":");
strcat(dirs, vals[i]);
}
- putenv(dirs);
-
efreet_shutdown();
+ setenv("XDG_DATA_DIRS", dirs, 1);
efreet_init();
i = 0;
@@ -205,10 +194,9 @@
}
efreet_shutdown();
+ setenv("XDG_DATA_DIRS", "", 1);
efreet_init();
- putenv("XDG_DATA_DIRS=");
-
i = 0;
tmp = efreet_data_dirs_get();
ecore_list_goto_first(tmp);
@@ -245,16 +233,14 @@
dirs[0] = '\0';
- strcat(dirs, "XDG_CONFIG_DIRS=");
for (i = 0; vals[i] != NULL; i++)
{
if (i > 0) strcat(dirs, ":");
strcat(dirs, vals[i]);
}
- putenv(dirs);
-
efreet_shutdown();
+ setenv("XDG_CONFIG_DIRS", dirs, 1);
efreet_init();
i = 0;
@@ -281,9 +267,8 @@
}
efreet_shutdown();
+ setenv("XDG_CONFIG_DIRS", "", 1);
efreet_init();
-
- putenv("XDG_CONFIG_DIRS=");
i = 0;
tmp = efreet_config_dirs_get();
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
