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

fix up enlightenment_start to use eina_prefix properly. 

SVN revision: 62890
This commit is contained in:
Carsten Haitzler 2011-08-27 16:25:51 +00:00
parent b92010d296
commit d781ff368c
3 changed files with 79 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -408,6 +408,10 @@ PKG_CHECK_MODULES(E_REMOTE, [
eina >= 1.0.999 eina >= 1.0.999
]) ])
PKG_CHECK_MODULES(E_START, [
eina >= 1.0.999
])
PKG_CHECK_MODULES(E_IMC, [ PKG_CHECK_MODULES(E_IMC, [
ecore-file >= 1.0.999 ecore-file >= 1.0.999
eet >= 1.4.0 eet >= 1.4.0

4
src/bin/Makefile.am
View File

@ -343,8 +343,8 @@ enlightenment_imc_LDADD = @E_IMC_LIBS@
enlightenment_start_SOURCES = \ enlightenment_start_SOURCES = \
e_start_main.c e_start_main.c
enlightenment_start_CFLAGS = $(INCLUDES) @E_START_CFLAGS@
enlightenment_start_LDADD = @dlopen_libs@ enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@
enlightenment_thumb_SOURCES = \ enlightenment_thumb_SOURCES = \
e_sha1.c \ e_sha1.c \

373
src/bin/e_start_main.c
View File

@ -13,9 +13,10 @@
#ifdef HAVE_ALLOCA_H #ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>
#endif #endif
#include <Eina.h>
static void env_set(const char *var, const char *val); static void env_set(const char *var, const char *val);
static int prefix_determine(char *argv0); EAPI int prefix_determine(char *argv0);
static void static void
env_set(const char *var, const char *val) env_set(const char *var, const char *val)
@ -29,10 +30,8 @@ env_set(const char *var, const char *val)
buf = alloca(strlen(var) + 1 + strlen(val) + 1); buf = alloca(strlen(var) + 1 + strlen(val) + 1);
snprintf(buf, sizeof(buf), "%s=%s", var, val); snprintf(buf, sizeof(buf), "%s=%s", var, val);
if (getenv(var)) if (getenv(var)) putenv(buf);
putenv(buf); else putenv(strdup(buf));
else
putenv(strdup(buf));
#endif #endif
} }
else else
@ -45,216 +44,21 @@ env_set(const char *var, const char *val)
} }
} }
/* local subsystem functions */
static int _prefix_fallbacks(void);
static int _prefix_try_proc(void);
static int _prefix_try_argv(char *argv0);
/* local subsystem globals */ /* local subsystem globals */
static char *_exe_path = NULL; static Eina_Prefix *pfx = NULL;
static char *_prefix_path = NULL;
/* externally accessible functions */ /* externally accessible functions */
static int EAPI int
prefix_determine(char *argv0) prefix_determine(char *argv0)
{ {
char *p; pfx = eina_prefix_new(argv0, prefix_determine,
"E", "enlightenment", "AUTHORS",
if (!_prefix_try_proc()) PACKAGE_BIN_DIR, PACKAGE_LIB_DIR,
{ PACKAGE_DATA_DIR, LOCALE_DIR);
if (!_prefix_try_argv(argv0)) if (!pfx) return 0;
{
_prefix_fallbacks();
return 0;
}
}
/* _exe_path is now a full absolute path TO this exe - figure out rest */
/* if
* exe = /blah/whatever/bin/exe
* then
* prefix = /blah/whatever
*/
p = strrchr(_exe_path, '/');
if (p)
{
p--;
while (p >= _exe_path)
{
if (*p == '/')
{
_prefix_path = malloc(p - _exe_path + 1);
if (_prefix_path)
{
strncpy(_prefix_path, _exe_path, p - _exe_path);
_prefix_path[p - _exe_path] = 0;
return 1;
}
else
{
free(_exe_path);
_exe_path = NULL;
_prefix_fallbacks();
return 0;
}
}
p--;
}
}
free(_exe_path);
_exe_path = NULL;
_prefix_fallbacks();
return 0;
}
static int
_prefix_fallbacks(void)
{
char *p;
_prefix_path = strdup(PACKAGE_BIN_DIR);
p = strrchr(_prefix_path, '/');
if (p) *p = 0;
printf("WARNING: Enlightenment could not determine its installed prefix\n"
" and is falling back on the compiled in default:\n"
" %s\n", _prefix_path);
return 1; return 1;
} }
static int
_prefix_try_proc(void)
{
FILE *f;
char buf[4096];
void *func = NULL;
func = (void *)_prefix_try_proc;
f = fopen("/proc/self/maps", "r");
if (!f) return 0;
while (fgets(buf, sizeof(buf), f))
{
int len;
char *p, mode[5] = "";
unsigned long ptr1 = 0, ptr2 = 0;
len = strlen(buf);
if (buf[len - 1] == '\n')
{
buf[len - 1] = 0;
len--;
}
if (sscanf(buf, "%lx-%lx %4s", &ptr1, &ptr2, mode) == 3)
{
if (!strcmp(mode, "r-xp"))
{
if (((void *)ptr1 <= func) && (func < (void *)ptr2))
{
p = strchr(buf, '/');
if (p)
{
if (len > 10)
{
if (!strcmp(buf + len - 10, " (deleted)"))
buf[len - 10] = 0;
}
_exe_path = strdup(p);
fclose(f);
return 1;
}
else
break;
}
}
}
}
fclose(f);
return 0;
}
static int
_prefix_try_argv(char *argv0)
{
char *path, *p, *cp, *s;
int len, lenexe;
#ifdef PATH_MAX
char buf[PATH_MAX], buf2[PATH_MAX], buf3[PATH_MAX];
#else
char buf[4096], buf2[4096], buf3[4096];
#endif
/* 1. is argv0 abs path? */
if (argv0[0] == '/')
{
_exe_path = strdup(argv0);
if (access(_exe_path, X_OK) == 0) return 1;
free(_exe_path);
_exe_path = NULL;
return 0;
}
/* 2. relative path */
if (strchr(argv0, '/'))
{
if (getcwd(buf3, sizeof(buf3)))
{
snprintf(buf2, sizeof(buf2), "%s/%s", buf3, argv0);
if (realpath(buf2, buf))
{
_exe_path = strdup(buf);
if (access(_exe_path, X_OK) == 0) return 1;
free(_exe_path);
_exe_path = NULL;
}
}
}
/* 3. argv0 no path - look in PATH */
path = getenv("PATH");
if (!path) return 0;
p = path;
cp = p;
lenexe = strlen(argv0);
while ((p = strchr(cp, ':')))
{
len = p - cp;
s = malloc(len + 1 + lenexe + 1);
if (s)
{
strncpy(s, cp, len);
s[len] = '/';
strcpy(s + len + 1, argv0);
if (realpath(s, buf))
{
if (access(buf, X_OK) == 0)
{
_exe_path = strdup(buf);
free(s);
return 1;
}
}
free(s);
}
cp = p + 1;
}
len = strlen(cp);
s = malloc(len + 1 + lenexe + 1);
if (s)
{
strncpy(s, cp, len);
s[len] = '/';
strcpy(s + len + 1, argv0);
if (realpath(s, buf))
{
if (access(buf, X_OK) == 0)
{
_exe_path = strdup(buf);
free(s);
return 1;
}
}
free(s);
}
/* 4. big problems. arg[0] != executable - weird execution */
return 0;
}
static void static void
precache(void) precache(void)
{ {
@ -279,8 +83,7 @@ precache(void)
if (l > 0) buf[l - 1] = 0; if (l > 0) buf[l - 1] = 0;
if (!fork()) if (!fork())
{ {
if (buf[0] == 's') if (buf[0] == 's') stat(buf + 2, &st);
stat(buf + 2, &st);
else if (buf[0] == 'o') else if (buf[0] == 'o')
{ {
fd = open(buf + 2, O_RDONLY); fd = open(buf + 2, O_RDONLY);
@ -321,32 +124,22 @@ static int
find_valgrind(char *path, size_t path_len) find_valgrind(char *path, size_t path_len)
{ {
const char *env = getenv("PATH"); const char *env = getenv("PATH");
while (env) while (env)
{ {
const char *p = strchr(env, ':'); const char *p = strchr(env, ':');
ssize_t p_len; ssize_t p_len;
if (p) if (p) p_len = p - env;
p_len = p - env; else p_len = strlen(env);
else if (p_len <= 0) goto next;
p_len = strlen(env); else if (p_len + sizeof("/valgrind") >= path_len) goto next;
if (p_len <= 0)
goto next;
else if (p_len + sizeof("/valgrind") >= path_len)
goto next;
memcpy(path, env, p_len); memcpy(path, env, p_len);
memcpy(path + p_len, "/valgrind", sizeof("/valgrind")); memcpy(path + p_len, "/valgrind", sizeof("/valgrind"));
if (access(path, X_OK | R_OK) == 0) if (access(path, X_OK | R_OK) == 0) return 1;
return 1; next:
if (p) env = p + 1;
next: else break;
if (p)
env = p + 1;
else
break;
} }
path[0] = '\0'; path[0] = '\0';
return 0; return 0;
@ -366,51 +159,39 @@ valgrind_append(char **dst, int valgrind_mode, int valgrind_tool, char *valgrind
if (valgrind_tool) if (valgrind_tool)
{ {
dst[i++] = valgrind_path; dst[i++] = valgrind_path;
switch (valgrind_tool) switch (valgrind_tool)
{ {
case 1: dst[i++] = "--tool=massif"; break; case 1: dst[i++] = "--tool=massif"; break;
case 2: dst[i++] = "--tool=callgrind"; break; case 2: dst[i++] = "--tool=callgrind"; break;
} }
return i; return i;
} }
if (!valgrind_mode) return 0;
if (!valgrind_mode)
return 0;
dst[i++] = valgrind_path; dst[i++] = valgrind_path;
dst[i++] = "--track-origins=yes"; dst[i++] = "--track-origins=yes";
dst[i++] = "--malloc-fill=13"; /* invalid pointer, make it crash */ dst[i++] = "--malloc-fill=13"; /* invalid pointer, make it crash */
if (valgrind_log) if (valgrind_log)
{ {
static char logparam[PATH_MAX + sizeof("--log-file=")]; static char logparam[PATH_MAX + sizeof("--log-file=")];
snprintf(logparam, sizeof(logparam), "--log-file=%s", valgrind_log); snprintf(logparam, sizeof(logparam), "--log-file=%s", valgrind_log);
dst[i++] = logparam; dst[i++] = logparam;
} }
if (valgrind_mode & 2) dst[i++] = "--trace-children=yes";
if (valgrind_mode & 2)
dst[i++] = "--trace-children=yes";
if (valgrind_mode & 4) if (valgrind_mode & 4)
{ {
dst[i++] = "--leak-check=full"; dst[i++] = "--leak-check=full";
dst[i++] = "--leak-resolution=high"; dst[i++] = "--leak-resolution=high";
dst[i++] = "--track-fds=yes"; dst[i++] = "--track-fds=yes";
} }
if (valgrind_mode & 8) dst[i++] = "--show-reachable=yes";
if (valgrind_mode & 8)
dst[i++] = "--show-reachable=yes";
return i; return i;
} }
static void static void
copy_args(char **dst, char **src, size_t count) copy_args(char **dst, char **src, size_t count)
{ {
for (; count > 0; count--, dst++, src++) for (; count > 0; count--, dst++, src++) *dst = *src;
*dst = *src;
} }
int int
@ -422,18 +203,19 @@ main(int argc, char **argv)
char valgrind_path[PATH_MAX] = ""; char valgrind_path[PATH_MAX] = "";
const char *valgrind_log = NULL; const char *valgrind_log = NULL;
eina_init();
prefix_determine(argv[0]); prefix_determine(argv[0]);
env_set("E_START", argv[0]); env_set("E_START", argv[0]);
p = getenv("PATH"); p = getenv("PATH");
if (p) snprintf(buf, sizeof(buf), "%s/bin:%s", _prefix_path, p); if (p) snprintf(buf, sizeof(buf), "%s:%s", eina_prefix_bin_get(pfx), p);
else snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); else snprintf(buf, sizeof(buf), "%s", eina_prefix_bin_get(pfx));
env_set("PATH", buf); env_set("PATH", buf);
p = getenv("LD_LIBRARY_PATH"); p = getenv("LD_LIBRARY_PATH");
if (p) snprintf(buf, sizeof(buf), "%s/lib:%s", _prefix_path, p); if (p) snprintf(buf, sizeof(buf), "%s:%s", eina_prefix_lib_get(pfx), p);
else snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); else snprintf(buf, sizeof(buf), "%s", eina_prefix_lib_get(pfx));
env_set("LD_LIBRARY_PATH", buf); env_set("LD_LIBRARY_PATH", buf);
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
@ -443,63 +225,54 @@ main(int argc, char **argv)
{ {
const char *val = argv[i] + sizeof("-valgrind") - 1; const char *val = argv[i] + sizeof("-valgrind") - 1;
if (*val == '\0') if (*val == '\0') valgrind_mode = 1;
valgrind_mode = 1;
else if (*val == '-') else if (*val == '-')
{ {
val++; val++;
if (!strncmp(val, "log-file=", sizeof("log-file=") - 1)) if (!strncmp(val, "log-file=", sizeof("log-file=") - 1))
{ {
valgrind_log = val + sizeof("log-file=") - 1; valgrind_log = val + sizeof("log-file=") - 1;
if (*valgrind_log == '\0') if (*valgrind_log == '\0') valgrind_log = NULL;
valgrind_log = NULL;
} }
} }
else if (*val == '=') else if (*val == '=')
{ {
val++; val++;
if (!strcmp(val, "all")) if (!strcmp(val, "all")) valgrind_mode = VALGRIND_MODE_ALL;
valgrind_mode = VALGRIND_MODE_ALL; else valgrind_mode = atoi(val);
else
valgrind_mode = atoi(val);
} }
else else
printf("Unknown valgrind option: %s\n", argv[i]); printf("Unknown valgrind option: %s\n", argv[i]);
}
else if (!strcmp(argv[i], "-massif"))
{
valgrind_tool = 1;
}
else if (!strcmp(argv[i], "-callgrind"))
{
valgrind_tool = 2;
} }
else if (!strcmp(argv[i], "-massif")) valgrind_tool = 1;
else if (!strcmp(argv[i], "-callgrind")) valgrind_tool = 2;
else if ((!strcmp(argv[i], "-h")) || else if ((!strcmp(argv[i], "-h")) ||
(!strcmp(argv[i], "-help")) || (!strcmp(argv[i], "-help")) ||
(!strcmp(argv[i], "--help"))) (!strcmp(argv[i], "--help")))
{ {
printf printf
("Options:\n" (
"\t-no-precache\n" "Options:\n"
"\t\tDisable pre-caching of files\n" "\t-no-precache\n"
"\t-valgrind[=MODE]\n" "\t\tDisable pre-caching of files\n"
"\t\tRun enlightenment from inside valgrind, mode is OR of:\n" "\t-valgrind[=MODE]\n"
"\t\t 1 = plain valgrind to catch crashes (default)\n" "\t\tRun enlightenment from inside valgrind, mode is OR of:\n"
"\t\t 2 = trace children (thumbnailer, efm slaves, ...)\n" "\t\t 1 = plain valgrind to catch crashes (default)\n"
"\t\t 4 = check leak\n" "\t\t 2 = trace children (thumbnailer, efm slaves, ...)\n"
"\t\t 8 = show reachable after processes finish.\n" "\t\t 4 = check leak\n"
"\t\t all = all of above\n" "\t\t 8 = show reachable after processes finish.\n"
"\t-massif\n" "\t\t all = all of above\n"
"\t\tRun enlightenment from inside massif valgrind tool.\n" "\t-massif\n"
"\t-callgrind\n" "\t\tRun enlightenment from inside massif valgrind tool.\n"
"\t\tRun enlightenment from inside callgrind valgrind tool.\n" "\t-callgrind\n"
"\t-valgrind-log-file=<FILENAME>\n" "\t\tRun enlightenment from inside callgrind valgrind tool.\n"
"\t\tSave valgrind log to file, see valgrind's --log-file for details.\n" "\t-valgrind-log-file=<FILENAME>\n"
"\n" "\t\tSave valgrind log to file, see valgrind's --log-file for details.\n"
"Please run:\n" "\n"
"\tenlightenment %s\n" "Please run:\n"
"for more options.\n", "\tenlightenment %s\n"
argv[i]); "for more options.\n",
argv[i]);
exit(0); exit(0);
} }
} }
@ -512,20 +285,19 @@ main(int argc, char **argv)
valgrind_mode = 0; valgrind_mode = 0;
} }
} }
printf("E - PID=%i, do_precache=%i, valgrind=%d", getpid(), do_precache, valgrind_mode); printf("E - PID=%i, do_precache=%i, valgrind=%d", getpid(), do_precache, valgrind_mode);
if (valgrind_mode) if (valgrind_mode)
{ {
printf(" valgrind-command='%s'", valgrind_path); printf(" valgrind-command='%s'", valgrind_path);
if (valgrind_log) if (valgrind_log) printf(" valgrind-log-file='%s'", valgrind_log);
printf(" valgrind-log-file='%s'", valgrind_log);
} }
putchar('\n'); putchar('\n');
if (do_precache) if (do_precache)
{ {
void *lib, *func; void *lib, *func;
/* sanity checks - if precache might fail - check here first */ /* sanity checks - if precache might fail - check here first */
lib = dlopen("libeina.so", RTLD_GLOBAL | RTLD_LAZY); lib = dlopen("libeina.so", RTLD_GLOBAL | RTLD_LAZY);
if (!lib) dlopen("libeina.so.1", RTLD_GLOBAL | RTLD_LAZY); if (!lib) dlopen("libeina.so.1", RTLD_GLOBAL | RTLD_LAZY);
@ -570,31 +342,32 @@ main(int argc, char **argv)
if (!func) goto done; if (!func) goto done;
/* precache SHOULD work */ /* precache SHOULD work */
snprintf(buf, sizeof(buf), "%s/lib/enlightenment/preload/e_precache.so", _prefix_path); snprintf(buf, sizeof(buf), "%s/enlightenment/preload/e_precache.so",
eina_prefix_lib_get(pfx));
env_set("LD_PRELOAD", buf); env_set("LD_PRELOAD", buf);
printf("E - PRECACHE GOING NOW...\n"); printf("E - PRECACHE GOING NOW...\n");
fflush(stdout); fflush(stdout);
precache(); precache();
} }
done: done:
/* try dbus-launch */ /* try dbus-launch */
snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path); snprintf(buf, sizeof(buf), "%s/enlightenment", eina_prefix_bin_get(pfx));
args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *)); args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *));
if ((!getenv("DBUS_SESSION_BUS_ADDRESS")) && if ((!getenv("DBUS_SESSION_BUS_ADDRESS")) &&
(!getenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET"))) (!getenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET")))
{ {
args[0] = "dbus-launch"; args[0] = "dbus-launch";
args[1] = "--exit-with-session"; args[1] = "--exit-with-session";
i = 2 + valgrind_append(args + 2, valgrind_mode, valgrind_tool, valgrind_path, valgrind_log); i = 2 + valgrind_append(args + 2, valgrind_mode, valgrind_tool, valgrind_path, valgrind_log);
args[i++] = buf; args[i++] = buf;
copy_args(args + i, argv + 1, argc - 1); copy_args(args + i, argv + 1, argc - 1);
args[i + argc - 1] = NULL; args[i + argc - 1] = NULL;
execvp("dbus-launch", args); execvp("dbus-launch", args);
} }
/* dbus-launch failed - run e direct */ /* dbus-launch failed - run e direct */
i = valgrind_append(args, valgrind_mode, valgrind_tool, valgrind_path, valgrind_log); i = valgrind_append(args, valgrind_mode, valgrind_tool, valgrind_path, valgrind_log);
args[i++] = buf; args[i++] = buf;