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

Revert last patch

Browse Source
This commit is contained in:
Roy Marples
2007-09-25 17:30:07 +00:00
parent 1a6451654f
commit c6c7df47a0
14 changed files with 378 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/rc-update.c
View File

@@ -33,15 +33,15 @@ static ssize_t add (const char *runlevel, const char *service)
{
ssize_t retval = -1;
if (rc_service_exists (service) != 0)
if (! rc_service_exists (service))
eerror ("%s: service `%s' does not exist", applet, service);
else if (rc_runlevel_exists (runlevel) != 0)
else if (! rc_runlevel_exists (runlevel))
eerror ("%s: runlevel `%s' does not exist", applet, runlevel);
else if (rc_service_in_runlevel (service, runlevel) == 0) {
else if (rc_service_in_runlevel (service, runlevel)) {
ewarn ("%s: %s already installed in runlevel `%s'; skipping",
applet, service, runlevel);
retval = 0;
} else if (rc_service_add (runlevel, service) == 0) {
} else if (rc_service_add (runlevel, service)) {
einfo ("%s added to runlevel %s", service, runlevel);
retval = 1;
} else
@@ -55,16 +55,16 @@ static ssize_t delete (const char *runlevel, const char *service)
{
ssize_t retval = -1;
if (rc_service_in_runlevel (service, runlevel) == 0) {
if (rc_service_delete (runlevel, service) == 0) {
if (rc_service_in_runlevel (service, runlevel)) {
if (rc_service_delete (runlevel, service)) {
einfo ("%s removed from runlevel %s", service, runlevel);
retval = 1;
} else
eerror ("%s: failed to remove service `%s' from runlevel `%s': %s",
applet, service, runlevel, strerror (errno));
} else if (rc_service_exists (service) == -1)
} else if (! rc_service_exists (service))
eerror ("%s: service `%s' does not exist", applet, service);
else if (rc_runlevel_exists (runlevel) != 0)
else if (! rc_runlevel_exists (runlevel))
eerror ("%s: runlevel `%s' does not exist", applet, runlevel);
else
retval = 0;
@@ -85,7 +85,7 @@ static void show (char **runlevels, bool verbose)
bool inone = false;
STRLIST_FOREACH (runlevels, runlevel, j) {
if (rc_service_in_runlevel (service, runlevel) == 0) {
if (rc_service_in_runlevel (service, runlevel)) {
rc_strlist_add (&in, runlevel);
inone = true;
} else {
@@ -198,7 +198,7 @@ int rc_update (int argc, char **argv)
optind++;
while (optind < argc)
if (rc_runlevel_exists (argv[optind]) == 0)
if (rc_runlevel_exists (argv[optind]))
rc_strlist_add (&runlevels, argv[optind++]);
else {
rc_strlist_free (runlevels);