diff options
| author | Michael Jennings <mej@kainx.org> | 2002-06-03 00:24:22 +0000 |
|---|---|---|
| committer | Michael Jennings <mej@kainx.org> | 2002-06-03 00:24:22 +0000 |
| commit | 981b29c8950aa25559cca3f65dcbc293bae94e4f (patch) | |
| tree | 6713b67d2300583467acca78bf17315223c22030 /src/startup.c | |
| parent | 6df3396a5d8b8d5426693a789ebd2042688dd7a0 (diff) | |
| download | eterm-981b29c8950aa25559cca3f65dcbc293bae94e4f.tar.gz | |
Sun Jun 2 20:23:07 2002 Michael Jennings (mej)
Latest Escreen patch along with twin support from Azundris.
SVN revision: 6297
Diffstat (limited to 'src/startup.c')
| -rw-r--r-- | src/startup.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/startup.c b/src/startup.c index 82e6846..564f602 100644 --- a/src/startup.c +++ b/src/startup.c @@ -76,7 +76,8 @@ eterm_bootstrap(int argc, char *argv[]) int i; char *val; - static char windowid_string[20], *display_string, *term_string; /* "WINDOWID=\0" = 10 chars, UINT_MAX = 10 chars */ + static char windowid_string[20], *display_string, *term_string; /* "WINDOWID=\0" = 10 chars, UINT_MAX = 10 chars */ + orig_argv0 = argv[0]; /* Security enhancements -- mej */ @@ -156,8 +157,7 @@ eterm_bootstrap(int argc, char *argv[]) sprintf(tmp, "ETERM_THEME_ROOT=%s", theme_dir); putenv(tmp); } - if ((user_dir = conf_parse_theme(&rs_theme, (rs_config_file ? rs_config_file : USER_CFG), - (PARSE_TRY_USER_THEME | PARSE_TRY_NO_THEME))) != NULL) { + if ((user_dir = conf_parse_theme(&rs_theme, (rs_config_file ? rs_config_file : USER_CFG), (PARSE_TRY_USER_THEME | PARSE_TRY_NO_THEME))) != NULL) { char *tmp; D_OPTIONS(("conf_parse_theme() returned \"%s\"\n", user_dir)); @@ -172,7 +172,7 @@ eterm_bootstrap(int argc, char *argv[]) len = strlen(initial_dir); if (rs_path) { - len += strlen(rs_path) + 1; /* +1 for the colon */ + len += strlen(rs_path) + 1; /* +1 for the colon */ } if (theme_dir) { len += strlen(theme_dir) + 1; @@ -204,15 +204,6 @@ eterm_bootstrap(int argc, char *argv[]) p = p ? (p + 1) : orig_argv0; if (rs_url || !strncasecmp(ESCREEN_PREFIX, p, strlen(ESCREEN_PREFIX))) TermWin.screen_mode = NS_MODE_SCREEN; -# ifdef NS_DEBUG - if (!strncasecmp(ESCREEN_PREFIX, p, strlen(ESCREEN_PREFIX))) - fputs("You called me \"Escreen\"!\n", stderr); - else if (!strncasecmp(ETERM_PREFIX, p, strlen(ETERM_PREFIX))) - fputs("You called me \"Eterm\"!\n", stderr); - else - fputs("Stop calling me funky names!\n", stderr); - fprintf(stderr, "Escreen mode is %d (%d rows, URL is \"%s\")\n", TermWin.screen_mode, TermWin.nrow, rs_url); -# endif } #endif |