Fri Feb 24 16:58:43 2006 Michael Jennings (mej)
Add fallback attempt to open display in case NEED_LINUX_HACK is set and shouldn't be. ---------------------------------------------------------------------- SVN revision: 20766
This commit is contained in:
parent
7537403997
commit
e7117e77bf
|
@ -5476,3 +5476,8 @@ Mon Feb 13 14:51:56 2006 Michael Jennings (mej)
|
||||||
|
|
||||||
Update to libast 0.6+ API.
|
Update to libast 0.6+ API.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
Fri Feb 24 16:58:43 2006 Michael Jennings (mej)
|
||||||
|
|
||||||
|
Add fallback attempt to open display in case NEED_LINUX_HACK is set
|
||||||
|
and shouldn't be.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
|
@ -73,7 +73,6 @@ Atom props[NUM_PROPS];
|
||||||
int
|
int
|
||||||
eterm_bootstrap(int argc, char *argv[])
|
eterm_bootstrap(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
char *val;
|
char *val;
|
||||||
|
|
||||||
|
@ -81,7 +80,7 @@ eterm_bootstrap(int argc, char *argv[])
|
||||||
static char windowid_string[20], *display_string, *term_string;
|
static char windowid_string[20], *display_string, *term_string;
|
||||||
|
|
||||||
orig_argv0 = argv[0];
|
orig_argv0 = argv[0];
|
||||||
|
|
||||||
/* Security enhancements -- mej */
|
/* Security enhancements -- mej */
|
||||||
putenv("IFS= \t\n");
|
putenv("IFS= \t\n");
|
||||||
my_ruid = getuid();
|
my_ruid = getuid();
|
||||||
|
@ -116,7 +115,7 @@ eterm_bootstrap(int argc, char *argv[])
|
||||||
#ifdef NEED_LINUX_HACK
|
#ifdef NEED_LINUX_HACK
|
||||||
privileges(REVERT);
|
privileges(REVERT);
|
||||||
#endif
|
#endif
|
||||||
if (!Xdisplay) {
|
if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) {
|
||||||
libast_print_error("can't open display %s\n", display_name);
|
libast_print_error("can't open display %s\n", display_name);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue