emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix service_started_daemon, bug #11

Browse Source
This commit is contained in:
Roy Marples 2008-01-28 13:16:33 +00:00
parent ae6929fa30
commit 9ce3086bf5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librc/librc-daemon.c
View File

@ -431,7 +431,7 @@ bool rc_service_started_daemon (const char *service, const char *exec,
} else { } else {
if ((dp = opendir (dirpath))) { if ((dp = opendir (dirpath))) {
while ((d = readdir (dp))) { while ((d = readdir (dp))) {
if (d->d_name[0] == ',') if (d->d_name[0] == '.')
continue; continue;
retval = _match_daemon (dirpath, d->d_name, mexec, NULL, NULL); retval = _match_daemon (dirpath, d->d_name, mexec, NULL, NULL);
if (retval) if (retval)

7
src/rc/rc-applets.c
View File

@ -229,11 +229,14 @@ static int do_service (int argc, char **argv)
service = getenv ("SVCNAME"); service = getenv ("SVCNAME");
if (argc > 3) { if (argc > 3) {
service = argv[0]; service = argv[1];
d = argv[2]; d = argv[2];
sscanf (argv[3], "%d", &idx); sscanf (argv[3], "%d", &idx);
} else if (argc == 3) { } else if (argc == 3) {
sscanf (argv[2], "%d", &idx); if (sscanf (argv[2], "%d", &idx) != 1) {
service = argv[1];
d = argv[2];
}
} }
exit (rc_service_started_daemon (service, d, idx) ? 0 : 1); exit (rc_service_started_daemon (service, d, idx) ? 0 : 1);
} else } else