diff options
| author | Roy Marples <roy@marples.name> | 2007-10-04 16:54:29 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-10-04 16:54:29 +0000 |
| commit | 87ea3e9e3bfa8e96b31d682f29fc7959bdd1b39e (patch) | |
| tree | 78680e84573e0ef6d81ff46fa33c968d8f43f6da /src/librc-daemon.c | |
| parent | e2e40afddef5253d5d669002b9afbea6bf3d6c66 (diff) | |
Punt rc_is_dir
Diffstat (limited to 'src/librc-daemon.c')
| -rw-r--r-- | src/librc-daemon.c | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/src/librc-daemon.c b/src/librc-daemon.c index b1734f67..e3da58d7 100644 --- a/src/librc-daemon.c +++ b/src/librc-daemon.c @@ -298,6 +298,7 @@ void rc_service_daemon_set (const char *service, const char *exec, char *mname; char *mpidfile; int nfiles = 0; + char *oldfile = NULL; free (svc); if (! exec && ! name && ! pidfile) @@ -325,28 +326,25 @@ void rc_service_daemon_set (const char *service, const char *exec, mpidfile = rc_xstrdup ("pidfile="); /* Regardless, erase any existing daemon info */ - if (rc_is_dir (dirpath)) { - char *oldfile = NULL; - files = rc_ls_dir (dirpath, 0); - STRLIST_FOREACH (files, file, i) { - ffile = rc_strcatpaths (dirpath, file, (char *) NULL); - nfiles++; - - if (! oldfile) { - if (_match_daemon (dirpath, file, mexec, mname, mpidfile)) { - unlink (ffile); - oldfile = ffile; - nfiles--; - } - } else { - rename (ffile, oldfile); - free (oldfile); + files = rc_ls_dir (dirpath, 0); + STRLIST_FOREACH (files, file, i) { + ffile = rc_strcatpaths (dirpath, file, (char *) NULL); + nfiles++; + + if (! oldfile) { + if (_match_daemon (dirpath, file, mexec, mname, mpidfile)) { + unlink (ffile); oldfile = ffile; + nfiles--; } + } else { + rename (ffile, oldfile); + free (oldfile); + oldfile = ffile; } - free (ffile); - rc_strlist_free (files); } + free (ffile); + rc_strlist_free (files); /* Now store our daemon info */ if (started) { @@ -387,12 +385,7 @@ bool rc_service_started_daemon (const char *service, const char *exec, dirpath = rc_strcatpaths (RC_SVCDIR, "daemons", basename (svc), (char *) NULL); free (svc); - - if (! rc_is_dir (dirpath)) { - free (dirpath); - return (false); - } - + i = strlen (exec) + 6; mexec = rc_xmalloc (sizeof (char *) * i); snprintf (mexec, i, "exec=%s", exec); @@ -413,6 +406,7 @@ bool rc_service_started_daemon (const char *service, const char *exec, rc_strlist_free (files); } + free (dirpath); free (mexec); return (retval); } @@ -445,11 +439,6 @@ bool rc_service_daemons_crashed (const char *service) (char *) NULL); free (svc); - if (! rc_is_dir (dirpath)) { - free (dirpath); - return (false); - } - memset (buffer, 0, sizeof (buffer)); files = rc_ls_dir (dirpath, 0); STRLIST_FOREACH (files, file, i) { |