Mon Feb 14 16:35:01 PST 2000 Michael Jennings <mej@eterm.org>
Oops. Little variable clash there. Always ended up with $ETERM_*_ROOT set to "in". I finally got around to investigating it. :-) SVN revision: 2076
This commit is contained in:
parent
42fde9c99d
commit
16580dfd29
|
@ -3161,3 +3161,10 @@ Thu Feb 10 15:10:01 PST 2000 Michael Jennings <mej@eterm.org>
|
||||||
that's broken, and enjoy!
|
that's broken, and enjoy!
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
Mon Feb 14 16:35:01 PST 2000 Michael Jennings <mej@eterm.org>
|
||||||
|
|
||||||
|
Oops. Little variable clash there. Always ended up with
|
||||||
|
$ETERM_*_ROOT set to "in". I finally got around to investigating it.
|
||||||
|
:-)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -150,4 +150,4 @@ Eterm|Eterm-color|eterm|Eterm with xterm-style color support (X Window System),
|
||||||
# Revert to the original foreground/background pair
|
# Revert to the original foreground/background pair
|
||||||
op=\e[39;49m,
|
op=\e[39;49m,
|
||||||
# Set foreground color, background color
|
# Set foreground color, background color
|
||||||
setaf=\e[%p1%{30}%+%dm, setab=\e[%p1%{40}%+%dm,
|
setaf=\e[3%p1%dm, setab=\e[4%p1%dm,
|
||||||
|
|
|
@ -3062,14 +3062,16 @@ conf_find_file(const char *file, const char *dir, const char *pathlist) {
|
||||||
strcpy(name, file);
|
strcpy(name, file);
|
||||||
}
|
}
|
||||||
len = strlen(name);
|
len = strlen(name);
|
||||||
D_OPTIONS(("conf_find_file(): Checking for file \"%s\"\n", name));
|
D_OPTIONS(("Checking for file \"%s\"\n", name));
|
||||||
if ((!access(name, R_OK)) && (!stat(name, &fst)) && (!S_ISDIR(fst.st_mode))) {
|
if ((!access(name, R_OK)) && (!stat(name, &fst)) && (!S_ISDIR(fst.st_mode))) {
|
||||||
|
D_OPTIONS(("Found \"%s\"\n", name));
|
||||||
return ((char *) name);
|
return ((char *) name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* maxpathlen is the longest possible path we can stuff into name[]. The - 2 saves room for
|
/* maxpathlen is the longest possible path we can stuff into name[]. The - 2 saves room for
|
||||||
an additional / and the trailing null. */
|
an additional / and the trailing null. */
|
||||||
if ((maxpathlen = sizeof(name) - len - 2) <= 0) {
|
if ((maxpathlen = sizeof(name) - len - 2) <= 0) {
|
||||||
|
D_OPTIONS(("Too big. I lose. :(\n", name));
|
||||||
return ((char *) NULL);
|
return ((char *) NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3093,8 +3095,9 @@ conf_find_file(const char *file, const char *dir, const char *pathlist) {
|
||||||
full_path[n] = '\0';
|
full_path[n] = '\0';
|
||||||
strcat(full_path, name);
|
strcat(full_path, name);
|
||||||
|
|
||||||
D_OPTIONS(("conf_find_file(): Checking for file \"%s\"\n", full_path));
|
D_OPTIONS(("Checking for file \"%s\"\n", full_path));
|
||||||
if ((!access(full_path, R_OK)) && (!stat(full_path, &fst)) && (!S_ISDIR(fst.st_mode))) {
|
if ((!access(full_path, R_OK)) && (!stat(full_path, &fst)) && (!S_ISDIR(fst.st_mode))) {
|
||||||
|
D_OPTIONS(("Found \"%s\"\n", full_path));
|
||||||
return ((char *) full_path);
|
return ((char *) full_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3136,7 +3139,7 @@ char *
|
||||||
conf_parse(char *conf_name, const char *dir, const char *path) {
|
conf_parse(char *conf_name, const char *dir, const char *path) {
|
||||||
|
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
char *name = NULL, *outfile, *p;
|
char *name = NULL, *outfile, *p = ".";
|
||||||
char buff[CONFIG_BUFF], orig_dir[PATH_MAX];
|
char buff[CONFIG_BUFF], orig_dir[PATH_MAX];
|
||||||
register unsigned long i = 0;
|
register unsigned long i = 0;
|
||||||
unsigned char id = 0;
|
unsigned char id = 0;
|
||||||
|
@ -3150,7 +3153,10 @@ conf_parse(char *conf_name, const char *dir, const char *path) {
|
||||||
if ((p = strrchr(name, '/')) != NULL) {
|
if ((p = strrchr(name, '/')) != NULL) {
|
||||||
getcwd(orig_dir, PATH_MAX);
|
getcwd(orig_dir, PATH_MAX);
|
||||||
*p = 0;
|
*p = 0;
|
||||||
|
p = name;
|
||||||
chdir(name);
|
chdir(name);
|
||||||
|
} else {
|
||||||
|
p = ".";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -3264,7 +3270,8 @@ conf_parse(char *conf_name, const char *dir, const char *path) {
|
||||||
if (*orig_dir) {
|
if (*orig_dir) {
|
||||||
chdir(orig_dir);
|
chdir(orig_dir);
|
||||||
}
|
}
|
||||||
return (StrDup(name));
|
D_OPTIONS(("Returning \"%s\"\n", p));
|
||||||
|
return (StrDup(p));
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
|
|
|
@ -161,6 +161,7 @@ eterm_bootstrap(int argc, char *argv[])
|
||||||
if ((theme_dir = conf_parse_theme(rs_theme, THEME_CFG, 1)) != NULL) {
|
if ((theme_dir = conf_parse_theme(rs_theme, THEME_CFG, 1)) != NULL) {
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
|
||||||
|
D_OPTIONS(("conf_parse_theme() returned \"%s\"\n", theme_dir));
|
||||||
tmp = (char *) MALLOC(strlen(theme_dir) + sizeof("ETERM_THEME_ROOT=\0"));
|
tmp = (char *) MALLOC(strlen(theme_dir) + sizeof("ETERM_THEME_ROOT=\0"));
|
||||||
sprintf(tmp, "ETERM_THEME_ROOT=%s", theme_dir);
|
sprintf(tmp, "ETERM_THEME_ROOT=%s", theme_dir);
|
||||||
putenv(tmp);
|
putenv(tmp);
|
||||||
|
@ -168,6 +169,7 @@ eterm_bootstrap(int argc, char *argv[])
|
||||||
if ((user_dir = conf_parse_theme(rs_theme, (rs_config_file ? rs_config_file : USER_CFG), 0)) != NULL) {
|
if ((user_dir = conf_parse_theme(rs_theme, (rs_config_file ? rs_config_file : USER_CFG), 0)) != NULL) {
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
|
||||||
|
D_OPTIONS(("conf_parse_theme() returned \"%s\"\n", user_dir));
|
||||||
tmp = (char *) MALLOC(strlen(user_dir) + sizeof("ETERM_USER_ROOT=\0"));
|
tmp = (char *) MALLOC(strlen(user_dir) + sizeof("ETERM_USER_ROOT=\0"));
|
||||||
sprintf(tmp, "ETERM_USER_ROOT=%s", user_dir);
|
sprintf(tmp, "ETERM_USER_ROOT=%s", user_dir);
|
||||||
putenv(tmp);
|
putenv(tmp);
|
||||||
|
|
Loading…
Reference in New Issue