More path fixes thanks to Thomas Pani

This commit is contained in:
Roy Marples 2007-08-28 16:28:33 +00:00
parent f7583144f3
commit d3bd76486a
2 changed files with 5 additions and 6 deletions

View File

@ -640,10 +640,9 @@ char **rc_config_env (char **env)
env = rc_strlist_add (env, line); env = rc_strlist_add (env, line);
free (line); free (line);
if (rc_exists (RC_SVCDIR "ksoftlevel")) { if (rc_exists (RC_KSOFTLEVEL)) {
if (! (fp = fopen (RC_SVCDIR "ksoftlevel", "r"))) if (! (fp = fopen (RC_KSOFTLEVEL, "r")))
eerror ("fopen `%s': %s", RC_SVCDIR "ksoftlevel", eerror ("fopen `%s': %s", RC_KSOFTLEVEL, strerror (errno));
strerror (errno));
else { else {
memset (buffer, 0, sizeof (buffer)); memset (buffer, 0, sizeof (buffer));
if (fgets (buffer, sizeof (buffer), fp)) { if (fgets (buffer, sizeof (buffer), fp)) {

View File

@ -1016,8 +1016,8 @@ int main (int argc, char **argv)
eerrorx ("failed to load deptree"); eerrorx ("failed to load deptree");
/* Clean the failed services state dir now */ /* Clean the failed services state dir now */
if (rc_is_dir (RC_SVCDIR "failed")) if (rc_is_dir (RC_SVCDIR "/failed"))
rc_rm_dir (RC_SVCDIR "failed", false); rc_rm_dir (RC_SVCDIR "/failed", false);
mkdir (RC_STOPPING, 0755); mkdir (RC_STOPPING, 0755);