From d3bd76486adfcace8153f53fe192a393ded64d0a Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 28 Aug 2007 16:28:33 +0000 Subject: [PATCH] More path fixes thanks to Thomas Pani --- src/librc-misc.c | 7 +++---- src/rc.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/librc-misc.c b/src/librc-misc.c index 2aee5d43..a138ad02 100644 --- a/src/librc-misc.c +++ b/src/librc-misc.c @@ -640,10 +640,9 @@ char **rc_config_env (char **env) env = rc_strlist_add (env, line); free (line); - if (rc_exists (RC_SVCDIR "ksoftlevel")) { - if (! (fp = fopen (RC_SVCDIR "ksoftlevel", "r"))) - eerror ("fopen `%s': %s", RC_SVCDIR "ksoftlevel", - strerror (errno)); + if (rc_exists (RC_KSOFTLEVEL)) { + if (! (fp = fopen (RC_KSOFTLEVEL, "r"))) + eerror ("fopen `%s': %s", RC_KSOFTLEVEL, strerror (errno)); else { memset (buffer, 0, sizeof (buffer)); if (fgets (buffer, sizeof (buffer), fp)) { diff --git a/src/rc.c b/src/rc.c index 5c951beb..4e76b56b 100644 --- a/src/rc.c +++ b/src/rc.c @@ -1016,8 +1016,8 @@ int main (int argc, char **argv) eerrorx ("failed to load deptree"); /* Clean the failed services state dir now */ - if (rc_is_dir (RC_SVCDIR "failed")) - rc_rm_dir (RC_SVCDIR "failed", false); + if (rc_is_dir (RC_SVCDIR "/failed")) + rc_rm_dir (RC_SVCDIR "/failed", false); mkdir (RC_STOPPING, 0755);