Update ChangeLog

This fixes #239.

.cirrus.yml

@@ -1,15 +0,0 @@
-# Cirrus CI integration
-# https://cirrus-ci.org
-
-test_task:
-  freebsd_instance:
-    matrix:
-      image: freebsd-12-1-release-amd64
-      image: freebsd-11-4-release-amd64
-  env:
-    OS: FreeBSD
-  procfs_script: >
-    [ -f /proc/curproc ] || mount -t procfs proc /proc
-  pkg_install_script: pkg install -y bash gawk gmake gsed
-  gsed_hack_script: rm /usr/bin/sed && ln -s /usr/local/bin/gsed /usr/bin/sed
-  test_script: bash ci/cirrus.sh

.travis.yml

@@ -9,24 +9,6 @@ os:
 compiler:
   - gcc
   - clang
-  - musl-gcc
-
-addons:
-  apt:
-    packages:
-    - musl-tools
-
-notifications:
-  irc:
-    channels:
-      - "irc.libera.chat#openrc"
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
-
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y shellcheck
 
 script:
-  - ./ci/travis.sh
+  - ./test/travis.sh

AUTHORS

@@ -82,7 +82,6 @@ Semen Maryasin <marsoft@ya.ru>
 Sergei Trofimovich <slyfox@gentoo.org>
 Seth Robertson <in-gentoo@baka.org>
 S. Gilles <sgilles@umd.edu>
-Sony Interactive Entertainment, llc.
 Stefan Knoblich <s.knoblich@axsentis.de>
 Stef Simoens <stef.simoens@scarlet.be>
 Steve L <slong@rathaus.eclipse.co.uk>

Makefile

@@ -33,9 +33,8 @@ ifeq (${MKZSHCOMP},yes)
 SUBDIR+=	zsh-completion
 endif
 
-# We need to ensure that runlevels is done last other than test
+# We need to ensure that runlevels is done last
 SUBDIR+=	runlevels
-SUBDIR+=	test
 
 INSTALLAFTER=	_installafter
 

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.43.5
+VERSION=	0.40.1
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -4,40 +4,6 @@ OpenRC NEWS
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
-## OpenRC 0.43
-
-This version changes the behavior of the checkpath helper to address
-CVE-2018-21269. on Linux systems, We require  non-terminal symbolic links
-to be owned by root. Since we can't do this on non-linux xystems, we do
-not dereference non-terminal symbolic links by default. If you need them
-dereferenced, you should add the "-s" switch to the appropriate
-checkpath calls.
-For more information, see http://github.com/openrc/openrc/issues/201.
-
-The SHLIBDIR variable has been removed from the makefiles to make them
-more consistent with most common makefiles. All libraries are now in
-LIBDIR, so if you need to put them in /, override the LIBDIR variable
-when you run make.
-
-## OpenRC 0.42
-
-openrc-shutdown now has the ability to shut down sysvinit-based systems.
-
-A guide has been added for migrating systems using another init system
-to openrc-init.
-
-## OpenRC 0.41.
-
-This version adds the ability to format the output of rc-status when
-showing the status of services in a runlevel so that it may be parsed.
-Currently, the -f switch only accepts ini as an argument which
-causes the output to be in the .ini format.
-
-This version adds an experimental build time switch to allow setting the
-default shell to use for service scripts.
-By default, this is set to /bin/sh if it is changed, the new shell must
-be able to understand posix-compatible syntax.
-
 ## OpenRC 0.40
 
 In this version, the keymaps and termencoding services on Linux needed

README.md

@@ -2,7 +2,8 @@ OpenRC README
 =============
 
 OpenRC is a dependency-based init system that works with the
-system-provided init program, normally `/sbin/init`.
+system-provided init program, normally `/sbin/init`. Currently, it does
+not have an init program of its own.
 
 ## Installation
 
@@ -11,7 +12,7 @@ OpenRC requires GNU make.
 Once you have GNU Make installed, the default OpenRC installation can be
 executed using this command:
 
-`make install`
+make install
 
 ## Configuration
 
@@ -37,7 +38,6 @@ PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
 BRANDING=\"Gentoo/$(uname -s)\"
-SH=/bin/sh
 ```
 
 ## Notes
@@ -50,7 +50,7 @@ If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
 
 `PKG_PREFIX` should be set to where packages install to by default.
 
-`LOCAL_PREFIX` should be set to where user maintained packages are.
+`LOCAL_PREFIX` should be set when to where user maintained packages are.
 Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.
 
 `PREFIX` should be set when OpenRC is not installed to /.
@@ -78,14 +78,18 @@ remove them and then install so that the OS hooks into OpenRC.
 
 ## Reporting Bugs
 
-Please report bugs on our [bug tracker](http://github.com/OpenRC/openrc/issues).
+If you are using Gentoo Linux, bugs can be filed on their bugzilla under
+the `gentoo hosted projects` product and the `openrc` component [1].
+Otherwise, you can report issues on our github [2].
 
-If you can contribute code , please feel free to do so by opening
+Better yet, if you can contribute code, please feel free to submit pull
-[pull requests](https://github.com/OpenRC/openrc/pulls).
+requests [3].
 
 ## IRC Channel
 
-We have an official irc channel, #openrc on the libera network.
+We have an official irc channel, #openrc on freenode, feel free to join
-Please connect your irc client to irc.libera.chat and join #openrc on
+us there.
-that network.
 
+[1]	https://bugs.gentoo.org/
+[2]	https://github.com/openrc/openrc/issues
+[3]	https://github.com/openrc/openrc/pulls

bash-completion/rc-service

@@ -91,14 +91,11 @@ _rc_service()
 			done))
 			return 0
 		elif [[ ${COMP_CWORD} -eq 2 ]] && [[ ${prev} != -* ]]; then # if second word typed and we didn't type in a function
-			rc-service --exists "$prev" || return
+			filename=$(rc-service --resolve ${prev})
-			shopt -s extglob
+			opts=$(cat ${filename} | grep "^\w*()" | sed "s/().*$//")	# Greps the functions included in the init script
-			while read -r _ line; do
+			if [[ "x${opts}" == "x" ]] ; then			   # if no options found loosen the grep algorhythm
-				if [[ $line == +([[:alnum:]_]):* ]]; then
+				opts=$(cat ${filename} | grep "\w*()" | sed "s/().*$//")
-					opts+="${line%%:*} "
 			fi
-			done < <(rc-service "$prev" describe 2>&1)
-			shopt -u extglob
 			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 			return 0
 		fi

ci/travis.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-set -e
-set -u
-set -x
-
-# These are steps to run on TravisCI under a containerized Ubuntu system.
-# See $TOP/.travis.yml for more info about the TravisCI setup.
-
-# Run shellcheck, but don't fail (yet):
-shellcheck --version
-for shellscript in $(git ls-files); do
-	case $shellscript in
-		init.d/*.in) ;;
-		sh/*.in) ;;
-		sh/*.sh) ;;
-		support/init.d.examples/*.in) ;;
-		support/openvpn/*.sh) ;;
-		support/sysvinit/halt.sh) ;;
-		test/*.sh) ;;
-		*) continue ;;
-	esac
-	echo "Checking ${shellscript} with shellcheck:"
-	shellcheck -s sh "${shellscript}" || true
-done
-
-cpus=$(getconf _NPROCESSORS_CONF || echo 1)
-# make on TravisCI doesn't support -O yet
-make -j"${cpus}"
-
-make test

conf.d/hostname

@@ -1,2 +1,2 @@
-# Hostname fallback if /etc/hostname does not exist
+# Set to the hostname of this machine
 hostname="localhost"

etc/rc.conf

@@ -198,9 +198,10 @@ rc_tty_number=12
 # "unified" mounts cgroups version 2 on /sys/fs/cgroup
 #rc_cgroup_mode="hybrid"
 
-# This is a list of controllers which should be enabled for cgroups version 2
+# This is a list of controllers which should be enabled for cgroups version 2.
-# when hybrid mode is being used.
+# If hybrid mode is being used, controllers listed here will not be
-# Controllers listed here will not be available for cgroups version 1.
+# available for cgroups version 1.
+# This is a global setting.
 #rc_cgroup_controllers=""
 
 # This variable contains the cgroups version 2 settings for your services.

etc/rc.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

etc/rc.shutdown.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

init-guide.md

@@ -1,47 +0,0 @@
-# OpenRC init process guide
-
-OpenRC now includes an init process which can be used on Linux systems
-in place of sysvinit.
-
-## migrating a live system to openrc-init
-
-Configuring a live system to use this init process is very
-straight-forward, but the steps must be completed in this order.
-
-* have your boot loader add "init=/sbin/openrc-init" to the kernel command line
-
-The details of how to do this will vary from distro to distro, so they are
-out of scope for this document.
-
-* Install gettys into the runlevels where you need them.
-
-If you are using the provided /etc/init.d/agetty script,, you should
-first create symlinks in /etc/init.d to it for the ports where you
-want gettys to run, e.g. the following will work if you want gettys on
-tty1-tty6.
-
-```
-# cd /etc/init.d
-# for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-  ln -snf agetty agetty.$x
-  done
-```
-
-Once this is done, use ```rc-update``` as normal to install the agetty
-services in the appropriate runlevels.
-
-* Reboot your system.
-
-At this point you are running under openrc-init, and you should use
-openrc-shutdown to handle shutting down, powering off, rebooting etc.
-
-## optional sysvinit compatibility
-
-If you build and install OpenRC with MKSYSVINIT=yes, you will build and install
-wrappers that make openrc-init compatible with sysvinit -- you will have
-commands like "halt" "shutdown" "reboot" and "poweroff".
-
-If you want this functionality on a live system, you should first
-migrate the system to openrc-init, remove sysvinit, then rebuild and
-install this package with MKSYSVINIT=yes.
-

init.d/agetty.in

@@ -12,7 +12,6 @@
 description="start agetty on a terminal line"
 supervisor=supervise-daemon
 port="${RC_SVCNAME#*.}"
-respawn_period="${respawn_period:-60}"
 term_type="${term_type:-linux}"
 command=/sbin/agetty
 command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
@@ -21,7 +20,6 @@ pidfile="/run/${RC_SVCNAME}.pid"
 depend() {
 	after local
 	keyword -prefix
-	provide getty
 }
 
 start_pre() {

init.d/bootmisc.in

@@ -241,13 +241,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		if [ "$RC_UNAME" = Linux ]; then
+		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
-			if [ -x /sbin/halt ]; then
-				halt -w
-			else
-				openrc-shutdown -w
-			fi
-		fi
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi

init.d/cgroups.in

@@ -83,22 +83,14 @@ cgroup2_controllers()
 	local active cgroup_path x y
 	cgroup_path="$(cgroup2_find_path)"
 	[ -z "${cgroup_path}" ] && return 0
-	[ ! -e "${cgroup_path}/cgroup.controllers" ] && return 0
+	[ -e "${cgroup_path}/cgroup.controllers" ] &&
-	[ ! -e "${cgroup_path}/cgroup.subtree_control" ]&& return 0
 	read -r active < "${cgroup_path}/cgroup.controllers"
-	for x in ${active}; do
+	for x in ${rc_cgroup_controllers}; do
-	case "$rc_cgroup_mode" in
+		for y in ${active}; do
-		unified)
+		[ "$x" = "$y" ] &&
+			[ -e "${cgroup_path}/cgroup.subtree_control" ]&&
 			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-			;;
-		hybrid)
-			for y in ${rc_cgroup_controllers}; do
-				if [ "$x" = "$y" ]; then
-					echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-				fi
 		done
-			;;
-		esac
 	done
 	return 0
 }

init.d/devfs.in

@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -docker -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_dev()
@@ -66,7 +66,6 @@ seed_dev()
 {
 	# Seed /dev with some things that we know we need
 
-	if [ "${RC_SYS}" != LXC ]; then
 	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
 	# to $CONSOLE with/without bootsplash before udevd creates it
 	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
@@ -79,7 +78,6 @@ seed_dev()
 
 	# so udev can add its start-message to dmesg
 	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-	fi
 
 	# extra symbolic links not provided by default
 	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd

init.d/modules.in

@@ -41,18 +41,18 @@ find_modfiles()
 
 load_modules()
 {
-	local file m _modules rc x
+	local file m modules rc x
 	file=$1
 	[ -z "$file" ] && return 0
 	while read m x; do
 		case $m in
 			\;*) continue ;;
 			\#*) continue ;;
-			*) _modules="$_modules $m"
+			*) modules="$modules $m"
 			;;
 		esac
 	done < $file
-	for x in $_modules; do
+	for x in $modules; do
 		ebegin "Loading module $x"
 		case "$RC_UNAME" in
 			FreeBSD) kldload "$x"; rc=$? ;;

init.d/net-online.in

@@ -23,7 +23,7 @@ get_interfaces()
 {
 	local ifname iftype
 	for ifname in /sys/class/net/*; do
-		[ -h "${ifname}" ] || continue
+		[ -h "${ifname}" ] && continue
 		read iftype < ${ifname}/type
 		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
 	done

init.d/numlock.in

@@ -42,8 +42,6 @@ start()
 
 stop()
 {
-	yesno $RC_GOINGDOWN && return 0
-
 	ebegin "Disabling numlock on ttys"
 	_setleds -
 	eend $? "Failed to disable numlock"

init.d/osclock.in

@@ -17,15 +17,3 @@ depend()
 {
 	provide clock
 }
-
-start()
-{
-	# This stub function is required to avoid OpenRC warning at boot:
-	#
-	#  * The command variable is undefined.
-	#  * There is nothing for osclock to start.
-	#  * If this is what you intend, please write a start function.
-	#  * This will become a failure in a future release.
-	#
-	return 0
-}

man/openrc-run.8

@@ -461,7 +461,6 @@ Mark the service as inactive.
 .Op Fl p , -pipe
 .Op Fl m , -mode Ar mode
 .Op Fl o , -owner Ar owner
-.Op Fl s , -symlinks
 .Op Fl W , -writable
 .Op Fl q , -quiet
 .Ar path ...
@@ -482,11 +481,6 @@ or with names, and are separated by a colon.
 The truncate options (-D and -F) cause the directory or file to be
 cleared of all contents.
 .Pp
-If -s is not specified on a non-linux platform, checkpath will refuse to
-allow non-terminal symbolic links to exist in the path. This is for
-security reasons so that a non-root user can't create a symbolic link to
-a root-owned file and take ownership of that file.
-.Pp
 If -W is specified, checkpath checks to see if the first path given on
 the command line is writable.  This is different from how the test
 command in the shell works, because it also checks to make sure the file

man/openrc-shutdown.8

@@ -17,35 +17,15 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl c , -cancel
-.Nm
-.Op Fl R , -reexec
-.Nm
-.Op Fl w , -write-only
-.Nm
 .Op Fl d , -no-write
 .Op Fl D , -dry-run
 .Op Fl H , -halt
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl k , -kexec
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl p , -poweroff
-time
+.Op Fl R , -reexec
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl r , -reboot
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl s , -single
-time
+.Op Fl w , -write-only
 .Sh DESCRIPTION
 .Nm
 is the utility that communicates with
@@ -76,7 +56,7 @@ Stop all services, kill all processes and reboot the system.
 .It Fl s , -single
 Stop all services, kill all processes and move to single user mode.
 .It Fl w , -write-only
-Wrrite a wtmp shutdown record and do nothing else.
+Stop all services, kill all processes and move to single user mode.
 .El
 .Sh SEE ALSO
 .Xr openrc-init 8 ,

man/openrc.8

@@ -65,31 +65,7 @@ Instead you should use
 and
 .Xr shutdown 8
 and let them call these special runlevels.
-.Sh OPTIONS
-.Pp
-.Bl -tag -width "-o , --override"
-.It Fl n , -no-stop
-Do not stop any services.
-.It Fl o , -override
-Override the next runlevel to change into when leaving single user or boot
-runlevels
-.It Fl s , -service
-Run the service specified with the rest of the arguments.
-.It Fl S , -sys
-Output the RC system type, if any.
-.It Fl h , -help
-Display usage information and exit.
-.It Fl C , -nocolor
-Disable color output.
-.It Fl V , -version
-Display software version.
-.It Fl v , -verbose
-Run verbosely.
-.It Fl q , -quiet
-Run quietly (repeat to suppress errors).
-.El
 .Sh SEE ALSO
-.Xr openrc-run 8 ,
 .Xr rc-status 8 ,
 .Xr rc-update 8 ,
 .Xr init 8 ,

man/rc-status.8

@@ -17,7 +17,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl aclsuC
-.Op Fl f Ar ini
 .Op Ar runlevel
 .Sh DESCRIPTION
 .Nm
@@ -38,9 +37,6 @@ The options are as follows:
 Show all runlevels and their services.
 .It Fl c , -crashed
 List all services that have crashed.
-.It Fl f , -format
-Select a format for the output. Currently, the only one that can be
-specified is ini, which outputs in *.ini format.
 .It Fl l , -list
 List all defined runlevels.
 .It Fl m , -manual

man/start-stop-daemon.8

@@ -120,7 +120,7 @@ Saves the pid of the daemon in the file specified by the
 .Fl p , -pidfile
 option. Only useful when used with daemons that run in the foreground and
 forced into the background with the
-.Fl b , -background
+.Fl -b , -background
 option.
 .It Fl I , -ionice Ar class Ns Op : Ns Ar data
 Modifies the IO scheduling priority of the daemon.

man/supervise-daemon.8

@@ -9,7 +9,7 @@
 .\"    except according to the terms contained in the LICENSE file.
 .\"
 .Dd April 27, 2016
-.Dt SUPERVISE-DAEMON 8 SMM
+.Dt supervise-DAEMON 8 SMM
 .Os OpenRC
 .Sh NAME
 .Nm supervise-daemon
@@ -37,8 +37,6 @@ servicename
 .Ar count
 .Fl N , -nicelevel
 .Ar level
-.Fl p , -pidfile
-.Ar supervisorpidfile
 .Fl P , -respawn-period
 .Ar seconds
 .Fl R , -retry
@@ -90,17 +88,16 @@ owned by the user. You can optionally append a
 name here also.
 .It Fl v , -verbose
 Print the action(s) that are taken just before doing them.
-.El
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl a , -healthcheck-timer Ar seconds
+.Fl a , -healthcheck-timer Ar seconds
 Run the healthcheck() command, possibly followed by the unhealthy()
 command every time this number of seconds passes.
-.It Fl A , -healthcheck-delay Ar seconds
+.Fl A , -healthcheck-delay Ar seconds
 Wait this long before the first health check.
 .It Fl D , -respawn-delay Ar seconds
-Wait this number of seconds before restarting a daemon after it crashes.
+wait this number of seconds before restarting a daemon after it crashes.
 The default is 0.
 .It Fl d , -chdir Ar path
 chdir to this directory before starting the daemon.
@@ -124,9 +121,6 @@ If respawn-period is also set, more than respawn-max crashes must occur
 during respawn-period seconds to cause
 .Nm
 to give up and exit.
-.It Fl p , -pidfile Ar supervisorpidfile
-Sets a path for the supervisor's pid file. Note that this is not the pid
-file of the process that is being supervised.
 .It Fl N , -nicelevel Ar level
 Modifies the scheduling priority of the daemon.
 .It Fl P , -respawn-period Ar seconds
@@ -156,10 +150,6 @@ The same thing as
 but with the standard error output.
 .El
 .Sh ENVIRONMENT
-.Va SSD_IONICELEVEL
-can also set the IO scheduling priority of the daemon, but the command line
-option takes precedence.
-.Pp
 .Va SSD_NICELEVEL
 can also set the scheduling priority of the daemon, but the command line
 option takes precedence.

mk/lib.mk

@@ -52,12 +52,13 @@ ${SHLIB_NAME}:	${SOBJS}
 	${SOBJS} ${LDADD}
 
 install: all
-	${INSTALL} -d ${DESTDIR}${LIBDIR}
 ifeq (${MKSTATICLIBS},yes)
+	${INSTALL} -d ${DESTDIR}${LIBDIR}
 	${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR}
 endif
-	${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}
+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
-	ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+	${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
+	ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
 	${INSTALL} -d ${DESTDIR}${INCDIR}
 	for x in ${INCS}; do ${INSTALL} -m ${INCMODE} $$x ${DESTDIR}${INCDIR}; done
 

mk/os-Linux.mk

@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_XOPEN_SOURCE
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

mk/scripts.mk

@@ -19,7 +19,7 @@ _PKG_SED:=		$(shell ${_PKG_SED_SH})
 _LCL_SED_SH=		if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
 _LCL_SED:=		$(shell ${_LCL_SED_SH})
 
-SED_REPLACE=		-e 's:@SHELL@:${SH}:' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
+SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
 %.sh: %.sh.in
@@ -53,6 +53,7 @@ realinstall: ${BIN} ${CONF} ${INC}
 install: all realinstall ${INSTALLAFTER}
 
 check test::
+	@if test -e runtests.sh ; then ./runtests.sh || exit $$? ; fi
 
 # A lot of scripts don't have anything to clean
 # Also, some rm implentation require a file argument regardless of error

mk/sys.mk

@@ -52,9 +52,9 @@ _LIBNAME:=		$(shell ${_LIBNAME_SH})
 LIBNAME?=		${_LIBNAME}
 LIBDIR?=		${UPREFIX}/${LIBNAME}
 LIBMODE?=		0644
+SHLIBDIR?=		${PREFIX}/${LIBNAME}
 
 LIBEXECDIR?=		${PREFIX}/libexec/rc
-PKGCONFIGDIR?= ${UPREFIX}/${LIBNAME}/pkgconfig
 
 MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man

pkgconfig/Makefile

@@ -1,4 +1,4 @@
-DIR=	${PKGCONFIGDIR}
+DIR=	${LIBDIR}/pkgconfig
 SRCS=	einfo.pc.in openrc.pc.in
 INC=	einfo.pc openrc.pc
 

runlevels/Makefile

@@ -90,12 +90,6 @@ install:
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
 	fi
-	if test "${MKSYSVINIT}" = yes && test "${OS}" = Linux; then \
-		for x in tty1 tty2 tty3 tty4 tty5 tty6; do \
-			ln -snf ${INITDIR}/agetty ${DESTDIR}/${INITDIR}/"agetty.$$x" || exit $$?; \
-			ln -snf ${INITDIR}/agetty.$$x ${DEFAULTDIR}/"agetty.$$x" || exit $$?; \
-		done; \
-	fi
 
 check test::
 

scripts/halt.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 
 option_arg=
 poweroff_arg=
@@ -21,9 +21,4 @@ if [ -z "${poweroff_arg}" ]; then
 	poweroff_arg=--poweroff
 fi
 
-script_args="$@"
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"

scripts/on_ac_power

@@ -18,10 +18,9 @@ if [ -f /proc/acpi/ac_adapter/*/state ]; then
 		"state:"*"off-line") exit 128;;
 		esac
 	done
-elif [ -d /sys/class/power_supply ]; then
+elif [ -f /sys/class/power_supply/*/online ]; then
-	for dir in /sys/class/power_supply/*/; do
+	cat /sys/class/power_supply/*/online | while read line; do
-		[ "$(cat "${dir}/type")" != "Mains" ] && continue
+		[ "${line}" = 0 ] && exit 128
-		[ "$(cat "${dir}/online")" = 0 ] && exit 128
 	done
 elif [ -f /proc/pmu/info ]; then
 	cat /proc/pmu/info | while read line; do

scripts/poweroff.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 
 option_arg=
 poweroff_arg=
@@ -20,9 +20,4 @@ if [ -z "${poweroff_arg}" ]; then
 	poweroff_arg=--poweroff
 fi
 
-script_args="$@"
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"

scripts/rc-sstat.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

scripts/reboot.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 
 option_arg=
 poweroff_arg=
@@ -22,9 +22,4 @@ if [ -z "${poweroff_arg}" ]; then
 	poweroff_arg=--reboot
 fi
 
-script_args="$@"
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"

scripts/shutdown.in

@@ -1,31 +1,14 @@
-#!/bin/sh
+#!@SHELL@
 
-do_halt=false
+shutdown_arg=
 while getopts :akrhPHfFnct: opt; do
 	case "$opt" in
 		a) ;;
 		k) ;;
-		r)
+		r) shutdown_arg=--reboot ;;
-			shutdown_arg=--reboot
+		h) shutdown_arg=--halt ;;
-			;;
+		P) shutdown_arg=--poweroff ;;
-		h)
+		H) shutdown_arg=--halt ;;
-			do_halt=true
-			shutdown_arg=--poweroff
-			;;
-		P)
-			if ! ${do_halt}; then
-				printf "%s\n" "The -P flag requires the -h flag" >&2
-				exit 1
-			fi
-			shutdown_arg=--poweroff
-			;;
-		H)
-			if ! ${do_halt}; then
-				printf "%s\n" "The -H flag requires the -h flag" >&2
-				exit 1
-			fi
-			shutdown_arg=--halt
-			;;
 		f) ;;
 		F) ;;
 		n) ;;
@@ -42,5 +25,5 @@ if [ -z "${shutdown_arg}" ]; then
 	shutdown_arg=--single
 fi
 
-printf "%s %s\n" "@SBINDIR@/openrc-shutdown ${shutdown_arg}" "$@"
+echo @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
 exec @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"

sh/.gitignore

@@ -4,4 +4,6 @@ openrc-run.sh
 cgroup-release-agent.sh
 init.sh
 init-early.sh
+rc-cgroup.sh
+migrate-to-run.sh
 binfmt.sh

sh/Makefile

@@ -2,7 +2,7 @@ DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
 	openrc-run.sh.in ${SRCS-${OS}}
 INC=	rc-mount.sh functions.sh rc-functions.sh runit.sh s6.sh \
-		start-stop-daemon.sh supervise-daemon.sh ${INC-${OS}}
+		start-stop-daemon.sh supervise-daemon.sh
 BIN=	gendepends.sh init.sh openrc-run.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter
@@ -13,9 +13,10 @@ include ${MK}/os.mk
 SRCS-FreeBSD=
 BIN-FreeBSD=
 
-SRCS-Linux=	binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in
+SRCS-Linux=	binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in \
-BIN-Linux=	binfmt.sh cgroup-release-agent.sh init-early.sh
+	migrate-to-run.sh.in rc-cgroup.sh.in
-INC-Linux= rc-cgroup.sh
+BIN-Linux=	binfmt.sh cgroup-release-agent.sh init-early.sh migrate-to-run.sh \
+	rc-cgroup.sh
 
 SRCS-NetBSD=
 BIN-NetBSD=
@@ -31,3 +32,4 @@ _installafter:
 	ln -snf ${LIBEXECDIR}/sh/functions.sh ${DESTDIR}/${INITDIR} || exit $$?
 
 check test::
+	./runtests.sh

sh/binfmt.sh.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # This is a reimplementation of the systemd binfmt.d code to register
 # misc binary formats with the kernel.
 #
@@ -29,9 +29,6 @@ apply_file() {
 			\;*) continue ;;
 		esac
 
-		local reg=${line#*:}
-		[ -e /proc/sys/fs/binfmt_misc/${reg%%:*} ] && echo -1 > /proc/sys/fs/binfmt_misc/${reg%%:*}
-
 		echo "${line}" > /proc/sys/fs/binfmt_misc/register
 		rc=$?
 		if [ $rc -ne 0 ]; then

sh/cgroup-release-agent.sh.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # This is run by the kernel after the last task is removed from a
 # control group in the openrc hierarchy.
 

sh/init-early.sh.Linux.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -20,7 +20,7 @@ service_present()
 	# succeed if $RC_SYS empty, can't check further, assume script will run
 	[ -z "$RC_SYS" ] && return 0
 	# fail if file contains "-$RC_SYS", because then it won't run
-	grep -Eqi "^[[:space:]]*keyword[[:space:]].*-$RC_SYS([[:space:]]|$)" "$p" && return 1
+	egrep -qi "^[[:space:]]*keyword[[:space:]].*-$RC_SYS\>" "$p" && return 1
 	# succeed otherwise
 	return 0
 }

sh/init.sh.BSD.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

sh/init.sh.GNU-kFreeBSD.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

sh/init.sh.GNU.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

sh/init.sh.Linux.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 1999-2007 Gentoo Foundation
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
@@ -71,17 +71,20 @@ if [ "$sys" = VSERVER ]; then
 	rm -rf /run/*
 elif ! mountinfo -q /run; then
 	ebegin "Mounting /run"
-	run_mount_opts="mode=0755,nosuid,nodev,nr_inodes=800k,size=20%,strictatime"
+	rc=0
 	if ! fstabinfo --mount /run; then
-		if ! mount -t tmpfs -o ${run_mount_opts} tmpfs /run; then
+		mount -t tmpfs -o mode=0755,nodev,size=10% tmpfs /run
+		rc=$?
+	fi
+	if [ $rc != 0 ]; then
 		eerror "Unable to mount tmpfs on /run."
 		eerror "Can't continue."
 		exit 1
 	fi
 fi
-fi
 
-checkpath -d "$RC_SVCDIR"
+[ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
+checkpath -d $RC_SVCDIR
 checkpath -d -m 0775 -o root:uucp /run/lock
 
 # Try to mount xenfs as early as possible, otherwise rc_sys() will always
@@ -99,5 +102,4 @@ if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
 fi
 
 echo sysinit >"$RC_SVCDIR"/softlevel
-[ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
 exit 0

sh/migrate-to-run.sh.in

@@ -0,0 +1,36 @@
+#!@SHELL@
+# Copyright (c) 2012-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+#    except according to the terms contained in the LICENSE file.
+
+. "@LIBEXECDIR@/sh/functions.sh"
+
+if [ -e /run/openrc/softlevel ]; then
+	einfo "The OpenRC dependency data has already been migrated."
+	exit 0
+fi
+
+if [ ! -d /run ]; then
+	eerror "/run is not a directory."
+	eerror "moving /run to /run.pre-openrc"
+	mv /run /run.pre-openrc
+	mkdir /run
+fi
+
+rm -rf /run/openrc
+
+if ! mountinfo -q -f tmpfs /run; then
+	ln -s "@LIBEXECDIR@"/init.d /run/openrc
+else
+	cp -a "@LIBEXECDIR@/init.d" /run/openrc
+	rc-update -u
+fi
+
+einfo "The OpenRC dependency data was migrated successfully."
+exit 0

sh/openrc-run.sh.in

@@ -254,11 +254,8 @@ fi
 for _cmd; do
 	if [ "$_cmd" != status -a "$_cmd" != describe ]; then
 		# Apply any ulimit defined
-		if [ -n "${rc_ulimit:-$RC_ULIMIT}" ]; then
+		[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && \
-			if ! ulimit ${rc_ulimit:-$RC_ULIMIT}; then
+			ulimit ${rc_ulimit:-$RC_ULIMIT}
-				eerror "${RC_SVCNAME}: unable to apply RC_ULIMIT settings"
-			fi
-		fi
 		# Apply cgroups settings if defined
 		if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
 		then

sh/rc-cgroup.sh.in

@@ -1,3 +1,4 @@
+#!@SHELL@
 # Copyright (c) 2012-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -24,26 +25,18 @@ cgroup_find_path()
 	printf "%s" "${result}"
 }
 
-# This extracts all pids in a cgroup and puts them in the cgroup_pids
-# variable.
-# It is done this way to avoid subshells so we don't have to worry about
-# locating the pid of the subshell in the cgroup.
-# https://github.com/openrc/openrc/issues/396
 cgroup_get_pids()
 {
-	local cgroup_procs p
+	local cgroup_procs p pids
-	cgroup_pids=
 	cgroup_procs="$(cgroup2_find_path)"
-	if [ -n "${cgroup_procs}" ]; then
+	[ -n "${cgroup_procs}" ] &&
-		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs"
+		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs" ||
-	else
 		cgroup_procs="/sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks"
-	fi
 	[ -f "${cgroup_procs}" ] || return 0
 	while read -r p; do
-		[ "$p" -eq $$ ] && continue
+		[ "$p" -eq $$ ] || pids="${pids} ${p}"
-		cgroup_pids="${cgroup_pids} ${p}"
 	done < "${cgroup_procs}"
+	printf "%s" "${pids}"
 	return 0
 }
 
@@ -189,8 +182,7 @@ cgroup2_set_limits()
 {
 	local cgroup_path
 	cgroup_path="$(cgroup2_find_path)"
-	[ -z "${cgroup_path}" ] && return 0
+	[ -d "${cgroup_path}" ] || return 0
-	mountinfo -q "${cgroup_path}"|| return 0
 	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
 	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
 	[ -f "${rc_cgroup_path}"/cgroup.procs ] &&
@@ -201,7 +193,7 @@ cgroup2_set_limits()
 		[ -z "${value}" ] && continue
 		[ ! -f "${rc_cgroup_path}/${key}" ] && continue
 		veinfo "${RC_SVCNAME}: cgroups: setting ${key} to ${value}"
-		printf "%s" "${value}" > "${rc_cgroup_path}/${key}"
+		printf "%s\n" "${value}" > "${rc_cgroup_path}/${key}"
 	done
 	return 0
 }
@@ -209,29 +201,26 @@ cgroup2_set_limits()
 cgroup_cleanup()
 {
 	cgroup_running || return 0
-	ebegin "Starting cgroups cleanup"
+	ebegin "starting cgroups cleanup"
-	local loops=0
+	local pids loops=0
-	cgroup_get_pids
+	pids="$(cgroup_get_pids)"
-	if [ -n "${cgroup_pids}" ]; then
+	if [ -n "${pids}" ]; then
-		kill -s CONT ${cgroup_pids} 2> /dev/null
+		kill -s CONT ${pids} 2> /dev/null
-		kill -s "${stopsig:-TERM}" ${cgroup_pids} 2> /dev/null
+		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
 		yesno "${rc_send_sighup:-no}" &&
-			kill -s HUP ${cgroup_pids} 2> /dev/null
+			kill -s HUP ${pids} 2> /dev/null
-		kill -s "${stopsig:-TERM}" ${cgroup_pids} 2> /dev/null
+		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
-		cgroup_get_pids
+		while [ -n "$(cgroup_get_pids)" ] &&
-		while [ -n "${cgroup_pids}" ] &&
 			[ "${loops}" -lt "${rc_timeout_stopsec:-90}" ]; do
 			loops=$((loops+1))
 			sleep 1
-			cgroup_get_pids
 		done
-		if [ -n "${cgroup_pids}" ] && yesno "${rc_send_sigkill:-yes}"; then
+		pids="$(cgroup_get_pids)"
-			kill -s KILL ${cgroup_pids} 2> /dev/null
+		[ -n "${pids}" ] && yesno "${rc_send_sigkill:-yes}" &&
-		fi
+			kill -s KILL ${pids} 2> /dev/null
 	fi
 	cgroup2_remove
-	cgroup_get_pids
+	[ -z "$(cgroup_get_pids)" ]
-	[ -z "${cgroup_pids}" ]
 	eend $? "Unable to stop all processes"
 	return 0
 }

sh/runtests.sh

@@ -15,6 +15,7 @@
 ret=0
 
 tret=0
+ebegin "Testing yesno()"
 for f in yes YES Yes true TRUE True 1 ; do
 	if ! yesno $f; then
 		: $(( tret += 1 ))
@@ -27,7 +28,7 @@ for f in no NO No false FALSE False 0 ; do
 		echo "!$f!"
 	fi
 done
+eend $tret
 : $(( ret += $tret ))
 
-eend $ret
 exit $ret

src/Makefile

@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-SUBDIR=		libeinfo librc rc
+SUBDIR=		test libeinfo librc rc
 
 MK=		../mk
 include		${MK}/subdir.mk

src/includes/hidden-visibility.h

@@ -0,0 +1,26 @@
+/*
+ * Written by Mike Frysinger
+ * Placed in the Public Domain
+ */
+
+#ifndef _HIDDEN_VISIBILITY_H_
+#define _HIDDEN_VISIBILITY_H_
+
+#if defined(__ELF__) && defined(__GNUC__)
+# define __hidden_asmname(name) __hidden_asmname1 (__USER_LABEL_PREFIX__, name)
+# define __hidden_asmname1(prefix, name) __hidden_asmname2(prefix, name)
+# define __hidden_asmname2(prefix, name) #prefix name
+# define __hidden_proto(name, internal) \
+	extern __typeof (name) name __asm__ (__hidden_asmname (#internal)) \
+	__attribute__ ((visibility ("hidden")));
+# define __hidden_ver(local, internal, name) \
+   extern __typeof (name) __EI_##name __asm__(__hidden_asmname (#internal)); \
+   extern __typeof (name) __EI_##name __attribute__((alias (__hidden_asmname1 (,#local))))
+# define hidden_proto(name) __hidden_proto(name, __RC_##name)
+# define hidden_def(name) __hidden_ver(__RC_##name, name, name);
+#else
+# define hidden_proto(name)
+# define hidden_def(name)
+#endif
+
+#endif

src/libeinfo/libeinfo.c

@@ -15,7 +15,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-static const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
+const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -39,6 +39,34 @@ static const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "einfo.h"
 #include "helpers.h"
+#include "hidden-visibility.h"
+
+hidden_proto(ecolor)
+hidden_proto(ebegin)
+hidden_proto(ebeginv)
+hidden_proto(ebracket)
+hidden_proto(eend)
+hidden_proto(eendv)
+hidden_proto(eerror)
+hidden_proto(eerrorn)
+hidden_proto(eerrorx)
+hidden_proto(eindent)
+hidden_proto(eindentv)
+hidden_proto(einfo)
+hidden_proto(einfon)
+hidden_proto(einfov)
+hidden_proto(einfovn)
+hidden_proto(elog)
+hidden_proto(eoutdent)
+hidden_proto(eoutdentv)
+hidden_proto(eprefix)
+hidden_proto(ewarn)
+hidden_proto(ewarnn)
+hidden_proto(ewarnv)
+hidden_proto(ewarnvn)
+hidden_proto(ewarnx)
+hidden_proto(ewend)
+hidden_proto(ewendv)
 
 /* Incase we cannot work out how many columns from ioctl, supply a default */
 #define DEFAULT_COLS		 80
@@ -482,6 +510,7 @@ eprefix(const char *EINFO_RESTRICT prefix)
 {
 	_eprefix = prefix;
 }
+hidden_def(eprefix)
 
 static void EINFO_PRINTF(2, 0)
 elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap)
@@ -508,6 +537,7 @@ elog(int level, const char *EINFO_RESTRICT fmt, ...)
 	elogv(level, fmt, ap);
 	va_end(ap);
 }
+hidden_def(elog)
 
 static int
 _eindent(FILE * EINFO_RESTRICT stream)
@@ -546,6 +576,7 @@ _ecolor(FILE * EINFO_RESTRICT f, ECOLOR color)
 			return ecolors_str[i];
 	return "";
 }
+hidden_def(ecolor)
 
 const char *
 ecolor(ECOLOR color)
@@ -612,6 +643,7 @@ einfon(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfon");
 	return retval;
 }
+hidden_def(einfon)
 
 int
 ewarnn(const char *EINFO_RESTRICT fmt, ...)
@@ -627,6 +659,7 @@ ewarnn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarnn");
 	return retval;
 }
+hidden_def(ewarnn)
 
 int
 eerrorn(const char *EINFO_RESTRICT fmt, ...)
@@ -642,6 +675,7 @@ eerrorn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("errorn");
 	return retval;
 }
+hidden_def(eerrorn)
 
 int
 einfo(const char *EINFO_RESTRICT fmt, ...)
@@ -658,6 +692,7 @@ einfo(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfo");
 	return retval;
 }
+hidden_def(einfo)
 
 int
 ewarn(const char *EINFO_RESTRICT fmt, ...)
@@ -675,6 +710,7 @@ ewarn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarn");
 	return retval;
 }
+hidden_def(ewarn)
 
 void
 ewarnx(const char *EINFO_RESTRICT fmt, ...)
@@ -691,6 +727,7 @@ ewarnx(const char *EINFO_RESTRICT fmt, ...)
 	}
 	exit(EXIT_FAILURE);
 }
+hidden_def(ewarnx)
 
 int
 eerror(const char *EINFO_RESTRICT fmt, ...)
@@ -708,6 +745,7 @@ eerror(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("eerror");
 	return retval;
 }
+hidden_def(eerror)
 
 void
 eerrorx(const char *EINFO_RESTRICT fmt, ...)
@@ -723,6 +761,7 @@ eerrorx(const char *EINFO_RESTRICT fmt, ...)
 	}
 	exit(EXIT_FAILURE);
 }
+hidden_def(eerrorx)
 
 int
 ebegin(const char *EINFO_RESTRICT fmt, ...)
@@ -741,6 +780,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ebegin");
 	return retval;
 }
+hidden_def(ebegin)
 
 static void
 _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
@@ -814,6 +854,7 @@ eend(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("eend");
 	return retval;
 }
+hidden_def(eend)
 
 int
 ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -828,12 +869,14 @@ ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewend");
 	return retval;
 }
+hidden_def(ewend)
 
 void
 ebracket(int col, ECOLOR color, const char *msg)
 {
 	_eend(stdout, col, color, msg);
 }
+hidden_def(ebracket)
 
 void
 eindent(void)
@@ -855,6 +898,7 @@ eindent(void)
 	setenv("EINFO_INDENT", num, 1);
 	free(num);
 }
+hidden_def(eindent)
 
 void eoutdent(void)
 {
@@ -880,6 +924,7 @@ void eoutdent(void)
 	}
 	errno = serrno;
 }
+hidden_def(eoutdent)
 
 int
 einfovn(const char *EINFO_RESTRICT fmt, ...)
@@ -895,6 +940,7 @@ einfovn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfovn");
 	return retval;
 }
+hidden_def(einfovn)
 
 int
 ewarnvn(const char *EINFO_RESTRICT fmt, ...)
@@ -910,6 +956,7 @@ ewarnvn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarnvn");
 	return retval;
 }
+hidden_def(ewarnvn)
 
 int
 einfov(const char *EINFO_RESTRICT fmt, ...)
@@ -926,6 +973,7 @@ einfov(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfov");
 	return retval;
 }
+hidden_def(einfov)
 
 int
 ewarnv(const char *EINFO_RESTRICT fmt, ...)
@@ -942,6 +990,7 @@ ewarnv(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarnv");
 	return retval;
 }
+hidden_def(ewarnv)
 
 int
 ebeginv(const char *EINFO_RESTRICT fmt, ...)
@@ -961,6 +1010,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ebeginv");
 	return retval;
 }
+hidden_def(ebeginv)
 
 int
 eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -975,6 +1025,7 @@ eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("eendv");
 	return retval;
 }
+hidden_def(eendv)
 
 int
 ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -989,6 +1040,7 @@ ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewendv");
 	return retval;
 }
+hidden_def(ewendv)
 
 void
 eindentv(void)
@@ -996,6 +1048,7 @@ eindentv(void)
 	if (is_verbose())
 		eindent();
 }
+hidden_def(eindentv)
 
 void
 eoutdentv(void)
@@ -1003,3 +1056,4 @@ eoutdentv(void)
 	if (is_verbose())
 		eoutdent();
 }
+hidden_def(eoutdentv)

src/librc/librc-daemon.c

@@ -59,7 +59,7 @@ pid_is_argv(pid_t pid, const char *const *argv)
 		free(cmdline);
 		return false;
 	}
-	bytes = read(fd, buffer, sizeof(buffer) - 1);
+	bytes = read(fd, buffer, sizeof(buffer));
 	close(fd);
 	free(cmdline);
 	if (bytes == -1)
@@ -141,7 +141,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	memset(my_ns, 0, sizeof(my_ns));
 	memset(proc_ns, 0, sizeof(proc_ns));
 	if (exists("/proc/self/ns/pid")) {
-		rc = readlink("/proc/self/ns/pid", my_ns, sizeof(my_ns)-1);
+		rc = readlink("/proc/self/ns/pid", my_ns, sizeof(my_ns));
 		if (rc <= 0)
 			my_ns[0] = '\0';
 	}
@@ -155,12 +155,12 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 			continue;
 		xasprintf(&buffer, "/proc/%d/ns/pid", p);
 		if (exists(buffer)) {
-			rc = readlink(buffer, proc_ns, sizeof(proc_ns)-1);
+			rc = readlink(buffer, proc_ns, sizeof(proc_ns));
 			if (rc <= 0)
 				proc_ns[0] = '\0';
 		}
 		free(buffer);
-		if (pid == 0 && strlen(my_ns) && strlen (proc_ns) && strcmp(my_ns, proc_ns))
+		if (strlen(my_ns) && strlen (proc_ns) && strcmp(my_ns, proc_ns))
 			continue;
 		if (uid) {
 			xasprintf(&buffer, "/proc/%d", p);
@@ -208,6 +208,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	closedir(procdir);
 	return pids;
 }
+librc_hidden_def(rc_find_pids)
 
 #elif BSD
 
@@ -312,6 +313,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 
 	return pids;
 }
+librc_hidden_def(rc_find_pids)
 
 #else
 #  error "Platform not supported!"
@@ -453,6 +455,7 @@ rc_service_daemon_set(const char *service, const char *exec,
 	free(dirpath);
 	return retval;
 }
+librc_hidden_def(rc_service_daemon_set)
 
 bool
 rc_service_started_daemon(const char *service,
@@ -492,6 +495,7 @@ rc_service_started_daemon(const char *service,
 	free(dirpath);
 	return retval;
 }
+librc_hidden_def(rc_service_started_daemon)
 
 bool
 rc_service_daemons_crashed(const char *service)
@@ -611,7 +615,7 @@ rc_service_daemons_crashed(const char *service)
 				i = 0;
 				TAILQ_FOREACH(s, list, entries)
 				    argv[i++] = s->value;
-				argv[i] = NULL;
+				argv[i] = '\0';
 			}
 		}
 
@@ -649,3 +653,4 @@ rc_service_daemons_crashed(const char *service)
 
 	return retval;
 }
+librc_hidden_def(rc_service_daemons_crashed)

src/librc/librc-depend.c

@@ -78,16 +78,16 @@ rc_deptree_free(RC_DEPTREE *deptree)
 	}
 	free(deptree);
 }
+librc_hidden_def(rc_deptree_free)
 
 static RC_DEPINFO *
 get_depinfo(const RC_DEPTREE *deptree, const char *service)
 {
 	RC_DEPINFO *di;
-	if (deptree) {
+
 	TAILQ_FOREACH(di, deptree, entries)
 		if (strcmp(di->service, service) == 0)
 			return di;
-	}
 	return NULL;
 }
 
@@ -96,11 +96,9 @@ get_deptype(const RC_DEPINFO *depinfo, const char *type)
 {
 	RC_DEPTYPE *dt;
 
-	if (depinfo) {
 	TAILQ_FOREACH(dt, &depinfo->depends, entries)
 		if (strcmp(dt->type, type) == 0)
 			return dt;
-	}
 	return NULL;
 }
 
@@ -108,6 +106,7 @@ RC_DEPTREE *
 rc_deptree_load(void) {
 	return rc_deptree_load_file(RC_DEPTREE_CACHE);
 }
+librc_hidden_def(rc_deptree_load)
 
 RC_DEPTREE *
 rc_deptree_load_file(const char *deptree_file)
@@ -171,6 +170,7 @@ rc_deptree_load_file(const char *deptree_file)
 
 	return deptree;
 }
+librc_hidden_def(rc_deptree_load_file)
 
 static bool
 valid_service(const char *runlevel, const char *service, const char *type)
@@ -456,6 +456,7 @@ rc_deptree_depend(const RC_DEPTREE *deptree,
 		rc_stringlist_add(svcs, svc->value);
 	return svcs;
 }
+librc_hidden_def(rc_deptree_depend)
 
 RC_STRINGLIST *
 rc_deptree_depends(const RC_DEPTREE *deptree,
@@ -483,6 +484,7 @@ rc_deptree_depends(const RC_DEPTREE *deptree,
 	rc_stringlist_free(visited);
 	return sorted;
 }
+librc_hidden_def(rc_deptree_depends)
 
 RC_STRINGLIST *
 rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
@@ -538,6 +540,7 @@ rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
 	rc_stringlist_free(types);
 	return services;
 }
+librc_hidden_def(rc_deptree_order)
 
 
 /* Given a time, recurse the target path to find out if there are
@@ -627,6 +630,7 @@ rc_newer_than(const char *source, const char *target,
 
 	return mtime_check(source, target, true, newest, file);
 }
+librc_hidden_def(rc_newer_than)
 
 bool
 rc_older_than(const char *source, const char *target,
@@ -634,6 +638,7 @@ rc_older_than(const char *source, const char *target,
 {
 	return mtime_check(source, target, false, oldest, file);
 }
+librc_hidden_def(rc_older_than)
 
 typedef struct deppair
 {
@@ -729,6 +734,7 @@ rc_deptree_update_needed(time_t *newest, char *file)
 
 	return newer;
 }
+librc_hidden_def(rc_deptree_update_needed)
 
 /* This is a 7 phase operation
    Phase 1 is a shell script which loads each init script and config in turn
@@ -1075,3 +1081,4 @@ rc_deptree_update(void)
 	rc_deptree_free(deptree);
 	return retval;
 }
+librc_hidden_def(rc_deptree_update)

src/librc/librc-misc.c

@@ -43,6 +43,7 @@ rc_yesno(const char *value)
 
 	return false;
 }
+librc_hidden_def(rc_yesno)
 
 
 /**
@@ -90,6 +91,7 @@ rc_getfile(const char *file, char **buffer, size_t *len)
 	fclose(fp);
 	return ret;
 }
+librc_hidden_def(rc_getfile)
 
 ssize_t
 rc_getline(char **line, size_t *len, FILE *fp)
@@ -114,6 +116,7 @@ rc_getline(char **line, size_t *len, FILE *fp)
 	}
 	return last;
 }
+librc_hidden_def(rc_getline)
 
 char *
 rc_proc_getent(const char *ent _unused)
@@ -160,6 +163,7 @@ rc_proc_getent(const char *ent _unused)
 	return NULL;
 #endif
 }
+librc_hidden_def(rc_proc_getent)
 
 RC_STRINGLIST *
 rc_config_list(const char *file)
@@ -198,6 +202,7 @@ rc_config_list(const char *file)
 
 	return list;
 }
+librc_hidden_def(rc_config_list)
 
 static void rc_config_set_value(RC_STRINGLIST *config, char *value)
 {
@@ -272,6 +277,7 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 	char *tmp = NULL;
 	char *value = NULL;
 	size_t varlen = 0;
+	size_t len = 0;
 
 	overrides = rc_stringlist_new();
 
@@ -289,6 +295,7 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 		}
 
 		if (value != NULL) {
+			len = varlen + strlen(value) + 2;
 			xasprintf(&tmp, "%s=%s", override->value, value);
 		}
 
@@ -368,6 +375,7 @@ rc_config_load(const char *file)
 
 	return config;
 }
+librc_hidden_def(rc_config_load)
 
 char *
 rc_config_value(RC_STRINGLIST *list, const char *entry)
@@ -386,6 +394,7 @@ rc_config_value(RC_STRINGLIST *list, const char *entry)
 	}
 	return NULL;
 }
+librc_hidden_def(rc_config_value)
 
 /* Global for caching the strings loaded from rc.conf to avoid reparsing for
  * each rc_conf_value call */
@@ -431,3 +440,4 @@ rc_conf_value(const char *setting)
 
 	return rc_config_value(rc_conf, setting);
 }
+librc_hidden_def(rc_conf_value)

src/librc/librc-stringlist.c

@@ -25,6 +25,7 @@ rc_stringlist_new(void)
 	TAILQ_INIT(l);
 	return l;
 }
+librc_hidden_def(rc_stringlist_new)
 
 RC_STRING *
 rc_stringlist_add(RC_STRINGLIST *list, const char *value)
@@ -35,6 +36,7 @@ rc_stringlist_add(RC_STRINGLIST *list, const char *value)
 	TAILQ_INSERT_TAIL(list, s, entries);
 	return s;
 }
+librc_hidden_def(rc_stringlist_add)
 
 RC_STRING *
 rc_stringlist_addu(RC_STRINGLIST *list, const char *value)
@@ -49,6 +51,7 @@ rc_stringlist_addu(RC_STRINGLIST *list, const char *value)
 
 	return rc_stringlist_add(list, value);
 }
+librc_hidden_def(rc_stringlist_addu)
 
 bool
 rc_stringlist_delete(RC_STRINGLIST *list, const char *value)
@@ -66,6 +69,7 @@ rc_stringlist_delete(RC_STRINGLIST *list, const char *value)
 	errno = EEXIST;
 	return false;
 }
+librc_hidden_def(rc_stringlist_delete)
 
 RC_STRING *
 rc_stringlist_find(RC_STRINGLIST *list, const char *value)
@@ -79,6 +83,7 @@ rc_stringlist_find(RC_STRINGLIST *list, const char *value)
 	}
 	return NULL;
 }
+librc_hidden_def(rc_stringlist_find)
 
 RC_STRINGLIST *
 rc_stringlist_split(const char *value, const char *sep)
@@ -93,6 +98,7 @@ rc_stringlist_split(const char *value, const char *sep)
 
 	return list;
 }
+librc_hidden_def(rc_stringlist_split)
 
 void
 rc_stringlist_sort(RC_STRINGLIST **list)
@@ -122,6 +128,7 @@ rc_stringlist_sort(RC_STRINGLIST **list)
 	free(l);
 	*list = new;
 }
+librc_hidden_def(rc_stringlist_sort)
 
 void
 rc_stringlist_free(RC_STRINGLIST *list)
@@ -141,3 +148,4 @@ rc_stringlist_free(RC_STRINGLIST *list)
 	}
 	free(list);
 }
+librc_hidden_def(rc_stringlist_free)

src/librc/librc.c

@@ -15,7 +15,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-static const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
+const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "queue.h"
 #include "librc.h"
@@ -351,6 +351,7 @@ rc_sys(void)
 
 	return sys;
 }
+librc_hidden_def(rc_sys)
 
 static const char *
 rc_parse_service_state(RC_SERVICE state)
@@ -425,17 +426,20 @@ rc_runlevel_starting(void)
 {
 	return exists(RC_STARTING);
 }
+librc_hidden_def(rc_runlevel_starting)
 
 bool
 rc_runlevel_stopping(void)
 {
 	return exists(RC_STOPPING);
 }
+librc_hidden_def(rc_runlevel_stopping)
 
 RC_STRINGLIST *rc_runlevel_list(void)
 {
 	return ls_dir(RC_RUNLEVELDIR, LS_DIR);
 }
+librc_hidden_def(rc_runlevel_list)
 
 char *
 rc_runlevel_get(void)
@@ -462,6 +466,7 @@ rc_runlevel_get(void)
 
 	return runlevel;
 }
+librc_hidden_def(rc_runlevel_get)
 
 bool
 rc_runlevel_set(const char *runlevel)
@@ -474,6 +479,7 @@ rc_runlevel_set(const char *runlevel)
 	fclose(fp);
 	return true;
 }
+librc_hidden_def(rc_runlevel_set)
 
 bool
 rc_runlevel_exists(const char *runlevel)
@@ -481,14 +487,14 @@ rc_runlevel_exists(const char *runlevel)
 	char path[PATH_MAX];
 	struct stat buf;
 
-	if (!runlevel || strcmp(runlevel, "") == 0 || strcmp(runlevel, ".") == 0 ||
+	if (!runlevel || strcmp(runlevel, ".") == 0 || strcmp(runlevel, "..") == 0)
-		strcmp(runlevel, "..") == 0)
 		return false;
 	snprintf(path, sizeof(path), "%s/%s", RC_RUNLEVELDIR, runlevel);
 	if (stat(path, &buf) == 0 && S_ISDIR(buf.st_mode))
 		return true;
 	return false;
 }
+librc_hidden_def(rc_runlevel_exists)
 
 bool
 rc_runlevel_stack(const char *dst, const char *src)
@@ -501,6 +507,7 @@ rc_runlevel_stack(const char *dst, const char *src)
 	snprintf(d, sizeof(s), "%s/%s/%s", RC_RUNLEVELDIR, dst, src);
 	return (symlink(s, d) == 0 ? true : false);
 }
+librc_hidden_def(rc_runlevel_stack)
 
 bool
 rc_runlevel_unstack(const char *dst, const char *src)
@@ -510,6 +517,7 @@ rc_runlevel_unstack(const char *dst, const char *src)
 	snprintf(path, sizeof(path), "%s/%s/%s", RC_RUNLEVELDIR, dst, src);
 	return (unlink(path) == 0 ? true : false);
 }
+librc_hidden_def(rc_runlevel_unstack)
 
 RC_STRINGLIST *
 rc_runlevel_stacks(const char *runlevel)
@@ -522,6 +530,7 @@ rc_runlevel_stacks(const char *runlevel)
 	rc_stringlist_free(ancestor_list);
 	return stack;
 }
+librc_hidden_def(rc_runlevel_stacks)
 
 /* Resolve a service name to its full path */
 char *
@@ -549,7 +558,7 @@ rc_service_resolve(const char *service)
 
 	if (*file) {
 		memset(buffer, 0, sizeof(buffer));
-		r = readlink(file, buffer, sizeof(buffer)-1);
+		r = readlink(file, buffer, sizeof(buffer));
 		if (r > 0)
 			return xstrdup(buffer);
 	}
@@ -575,6 +584,7 @@ rc_service_resolve(const char *service)
 
 	return NULL;
 }
+librc_hidden_def(rc_service_resolve)
 
 bool
 rc_service_exists(const char *service)
@@ -613,6 +623,7 @@ rc_service_exists(const char *service)
 	free(file);
 	return retval;
 }
+librc_hidden_def(rc_service_exists)
 
 #define OPTSTR \
 ". '%s'; echo $extra_commands $extra_started_commands $extra_stopped_commands"
@@ -654,6 +665,7 @@ rc_service_extra_commands(const char *service)
 	free(cmd);
 	return commands;
 }
+librc_hidden_def(rc_service_extra_commands)
 
 #define DESCSTR ". '%s'; echo \"${description%s%s}\""
 char *
@@ -683,6 +695,7 @@ rc_service_description(const char *service, const char *option)
 	free(cmd);
 	return desc;
 }
+librc_hidden_def(rc_service_description)
 
 bool
 rc_service_in_runlevel(const char *service, const char *runlevel)
@@ -693,6 +706,7 @@ rc_service_in_runlevel(const char *service, const char *runlevel)
 	    runlevel, basename_c(service));
 	return exists(file);
 }
+librc_hidden_def(rc_service_in_runlevel)
 
 bool
 rc_service_mark(const char *service, const RC_SERVICE state)
@@ -812,6 +826,7 @@ rc_service_mark(const char *service, const RC_SERVICE state)
 	free(init);
 	return true;
 }
+librc_hidden_def(rc_service_mark)
 
 RC_SERVICE
 rc_service_state(const char *service)
@@ -854,6 +869,7 @@ rc_service_state(const char *service)
 
 	return state;
 }
+librc_hidden_def(rc_service_state)
 
 char *
 rc_service_value_get(const char *service, const char *option)
@@ -868,6 +884,7 @@ rc_service_value_get(const char *service, const char *option)
 
 	return buffer;
 }
+librc_hidden_def(rc_service_value_get)
 
 bool
 rc_service_value_set(const char *service, const char *option,
@@ -892,6 +909,7 @@ rc_service_value_set(const char *service, const char *option,
 	}
 		return true;
 }
+librc_hidden_def(rc_service_value_set)
 
 
 bool
@@ -918,6 +936,7 @@ rc_service_schedule_start(const char *service, const char *service_to_start)
 	free(init);
 	return retval;
 }
+librc_hidden_def(rc_service_schedule_start)
 
 bool
 rc_service_schedule_clear(const char *service)
@@ -930,6 +949,7 @@ rc_service_schedule_clear(const char *service)
 		return true;
 	return false;
 }
+librc_hidden_def(rc_service_schedule_clear)
 
 RC_STRINGLIST *
 rc_services_in_runlevel(const char *runlevel)
@@ -967,6 +987,7 @@ rc_services_in_runlevel(const char *runlevel)
 		list = rc_stringlist_new();
 	return list;
 }
+librc_hidden_def(rc_services_in_runlevel)
 
 RC_STRINGLIST *
 rc_services_in_runlevel_stacked(const char *runlevel)
@@ -983,6 +1004,7 @@ rc_services_in_runlevel_stacked(const char *runlevel)
 	}
 	return list;
 }
+librc_hidden_def(rc_services_in_runlevel_stacked)
 
 RC_STRINGLIST *
 rc_services_in_state(RC_SERVICE state)
@@ -1016,6 +1038,7 @@ rc_services_in_state(RC_SERVICE state)
 	rc_stringlist_free(dirs);
 	return list;
 }
+librc_hidden_def(rc_services_in_state)
 
 bool
 rc_service_add(const char *runlevel, const char *service)
@@ -1024,6 +1047,7 @@ rc_service_add(const char *runlevel, const char *service)
 	char *init;
 	char file[PATH_MAX];
 	char path[MAXPATHLEN] = { '\0' };
+	char *p = NULL;
 	char binit[PATH_MAX];
 	char *i;
 
@@ -1044,7 +1068,8 @@ rc_service_add(const char *runlevel, const char *service)
 	/* We need to ensure that only things in /etc/init.d are added
 	 * to the boot runlevel */
 	if (strcmp(runlevel, RC_LEVEL_BOOT) == 0) {
-		if (realpath(dirname(init), path) == NULL) {
+		p = realpath(dirname(init), path);
+		if (!*p) {
 			free(init);
 			return false;
 		}
@@ -1061,6 +1086,7 @@ rc_service_add(const char *runlevel, const char *service)
 	free(init);
 	return retval;
 }
+librc_hidden_def(rc_service_add)
 
 bool
 rc_service_delete(const char *runlevel, const char *service)
@@ -1073,6 +1099,7 @@ rc_service_delete(const char *runlevel, const char *service)
 		return true;
 	return false;
 }
+librc_hidden_def(rc_service_delete)
 
 RC_STRINGLIST *
 rc_services_scheduled_by(const char *service)
@@ -1091,6 +1118,7 @@ rc_services_scheduled_by(const char *service)
 	rc_stringlist_free(dirs);
 	return list;
 }
+librc_hidden_def(rc_services_scheduled_by)
 
 RC_STRINGLIST *
 rc_services_scheduled(const char *service)
@@ -1101,3 +1129,4 @@ rc_services_scheduled(const char *service)
 	    basename_c(service));
 	return ls_dir(dir, LS_INITD);
 }
+librc_hidden_def(rc_services_scheduled)

src/librc/librc.h

@@ -56,4 +56,67 @@
 #include "rc.h"
 #include "rc-misc.h"
 
+#include "hidden-visibility.h"
+#define librc_hidden_proto(x) hidden_proto(x)
+#define librc_hidden_def(x) hidden_def(x)
+
+librc_hidden_proto(rc_conf_value)
+librc_hidden_proto(rc_config_list)
+librc_hidden_proto(rc_config_load)
+librc_hidden_proto(rc_config_value)
+librc_hidden_proto(rc_deptree_depend)
+librc_hidden_proto(rc_deptree_depends)
+librc_hidden_proto(rc_deptree_free)
+librc_hidden_proto(rc_deptree_load)
+librc_hidden_proto(rc_deptree_load_file)
+librc_hidden_proto(rc_deptree_order)
+librc_hidden_proto(rc_deptree_update)
+librc_hidden_proto(rc_deptree_update_needed)
+librc_hidden_proto(rc_find_pids)
+librc_hidden_proto(rc_getfile)
+librc_hidden_proto(rc_getline)
+librc_hidden_proto(rc_newer_than)
+librc_hidden_proto(rc_proc_getent)
+librc_hidden_proto(rc_older_than)
+librc_hidden_proto(rc_runlevel_exists)
+librc_hidden_proto(rc_runlevel_get)
+librc_hidden_proto(rc_runlevel_list)
+librc_hidden_proto(rc_runlevel_set)
+librc_hidden_proto(rc_runlevel_stack)
+librc_hidden_proto(rc_runlevel_stacks)
+librc_hidden_proto(rc_runlevel_starting)
+librc_hidden_proto(rc_runlevel_stopping)
+librc_hidden_proto(rc_runlevel_unstack)
+librc_hidden_proto(rc_service_add)
+librc_hidden_proto(rc_service_daemons_crashed)
+librc_hidden_proto(rc_service_daemon_set)
+librc_hidden_proto(rc_service_delete)
+librc_hidden_proto(rc_service_description)
+librc_hidden_proto(rc_service_exists)
+librc_hidden_proto(rc_service_extra_commands)
+librc_hidden_proto(rc_service_in_runlevel)
+librc_hidden_proto(rc_service_mark)
+librc_hidden_proto(rc_service_resolve)
+librc_hidden_proto(rc_service_schedule_clear)
+librc_hidden_proto(rc_service_schedule_start)
+librc_hidden_proto(rc_services_in_runlevel)
+librc_hidden_proto(rc_services_in_runlevel_stacked)
+librc_hidden_proto(rc_services_in_state)
+librc_hidden_proto(rc_services_scheduled)
+librc_hidden_proto(rc_services_scheduled_by)
+librc_hidden_proto(rc_service_started_daemon)
+librc_hidden_proto(rc_service_state)
+librc_hidden_proto(rc_service_value_get)
+librc_hidden_proto(rc_service_value_set)
+librc_hidden_proto(rc_stringlist_add)
+librc_hidden_proto(rc_stringlist_addu)
+librc_hidden_proto(rc_stringlist_delete)
+librc_hidden_proto(rc_stringlist_find)
+librc_hidden_proto(rc_stringlist_free)
+librc_hidden_proto(rc_stringlist_new)
+librc_hidden_proto(rc_stringlist_split)
+librc_hidden_proto(rc_stringlist_sort)
+librc_hidden_proto(rc_sys)
+librc_hidden_proto(rc_yesno)
+
 #endif

src/rc/Makefile

@@ -14,8 +14,7 @@ SRCS+=		rc-selinux.c
 endif
 
 ifeq (${OS},Linux)
-SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-sysvinit.c broadcast.c \
+SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c broadcast.c rc-wtmp.c
-			rc-wtmp.c
 endif
 
 CLEANFILES=	version.h rc-selinux.o
@@ -113,7 +112,7 @@ veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
 fstabinfo: fstabinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-openrc-init: openrc-init.o rc-plugin.o rc-wtmp.o
+openrc-init: openrc-init.o rc-wtmp.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 is_newer_than: is_newer_than.o rc-misc.o
@@ -135,7 +134,7 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
 openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-openrc-shutdown: openrc-shutdown.o rc-misc.o _usage.o broadcast.o rc-wtmp.o rc-sysvinit.o
+openrc-shutdown: openrc-shutdown.o rc-misc.o _usage.o broadcast.o rc-wtmp.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o

src/rc/broadcast.c

@@ -37,6 +37,10 @@
 # define _PATH_DEV	"/dev/"
 #endif
 
+#ifndef UT_LINESIZE
+#define UT_LINESIZE __UT_LINESIZE
+#endif
+
 static sigjmp_buf jbuf;
 
 /*
@@ -58,7 +62,7 @@ static void getuidtty(char **userp, char **ttyp)
 	uid_t			uid;
 	char			*tty;
 	static char		uidbuf[32];
-	char		*ttynm = NULL;
+	static char		ttynm[UT_LINESIZE + 4];
 
 	uid = getuid();
 	if ((pwd = getpwuid(uid)) != NULL) {
@@ -78,8 +82,10 @@ static void getuidtty(char **userp, char **ttyp)
 			if (tty[0] == '/')
 				tty++;
 		}
-		xasprintf(&ttynm, "(%s) ", tty);
+		snprintf(ttynm, sizeof(ttynm), "(%.*s) ",
-	}
+				 UT_LINESIZE, tty);
+	} else
+		ttynm[0] = 0;
 
 	*userp = uidbuf;
 	*ttyp  = ttynm;
@@ -127,7 +133,7 @@ void broadcast(char *text)
 	char *p;
 	char *line = NULL;
 	struct sigaction sa;
-	volatile int fd;
+	int fd;
 	FILE *tp;
 	int	flags;
 	char *term = NULL;
@@ -150,7 +156,6 @@ void broadcast(char *text)
 
 	xasprintf(&line, "\007\r\nBroadcast message from %s@%s %s(%s):\r\n\r\n",
 			user, name.nodename, tty, date);
-	free(tty);
 
 	/*
 	 *	Fork to avoid hanging in a write()

src/rc/checkpath.c

@@ -16,7 +16,6 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -24,7 +23,6 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
-#include <libgen.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,7 +44,7 @@ typedef enum {
 
 const char *applet = NULL;
 const char *extraopts ="path1 [path2] [...]";
-const char *getoptstring = "dDfFpm:o:sW" getoptstring_COMMON;
+const char *getoptstring = "dDfFpm:o:W" getoptstring_COMMON;
 const struct option longopts[] = {
 	{ "directory",          0, NULL, 'd'},
 	{ "directory-truncate", 0, NULL, 'D'},
@@ -55,7 +53,6 @@ const struct option longopts[] = {
 	{ "pipe",               0, NULL, 'p'},
 	{ "mode",               1, NULL, 'm'},
 	{ "owner",              1, NULL, 'o'},
-	{ "symlinks",           0, NULL, 's'},
 	{ "writable",           0, NULL, 'W'},
 	longopts_COMMON
 };
@@ -67,119 +64,15 @@ const char * const longopts_help[] = {
 	"Create a named pipe (FIFO) if not exists",
 	"Mode to check",
 	"Owner to check (user:group)",
-	"follow symbolic links (irrelivent on linux)",
 	"Check whether the path is writable or not",
 	longopts_help_COMMON
 };
 const char *usagestring = NULL;
 
-static int get_dirfd(char *path, bool symlinks) {
-	char *ch;
-	char *item;
-	char *linkpath = NULL;
-	char *path_dupe;
-	char *str;
-	int components = 0;
-	int dirfd;
-	int flags = 0;
-	int new_dirfd;
-	struct stat st;
-	ssize_t linksize;
-
-	if (!path || *path != '/')
-		eerrorx("%s: empty or relative path", applet);
-	dirfd = openat(dirfd, "/", O_RDONLY);
-	if (dirfd == -1)
-		eerrorx("%s: unable to open the root directory: %s",
-				applet, strerror(errno));
-	ch = path;
-	while (*ch) {
-		if (*ch == '/')
-			components++;
-		ch++;
-	}
-	path_dupe = xstrdup(path);
-	item = strtok(path_dupe, "/");
-#ifdef O_PATH
-	flags |= O_PATH;
-#endif
-	if (!symlinks)
-		flags |= O_NOFOLLOW;
-	flags |= O_RDONLY;
-	while (dirfd > 0 && item && components > 1) {
-		str = xstrdup(linkpath ? linkpath : item);
-		new_dirfd = openat(dirfd, str, flags);
-		if (new_dirfd == -1)
-			eerrorx("%s: %s: could not open %s: %s", applet, path, str,
-					strerror(errno));
-		if (fstat(new_dirfd, &st) == -1)
-			eerrorx("%s: %s: unable to stat %s: %s", applet, path, item,
-					strerror(errno));
-		if (S_ISLNK(st.st_mode) ) {
-			if (st.st_uid != 0)
-				eerrorx("%s: %s: symbolic link %s not owned by root",
-						applet, path, str);
-			linksize = st.st_size+1;
-			if (linkpath)
-				free(linkpath);
-			linkpath = xmalloc(linksize);
-			memset(linkpath, 0, linksize);
-			if (readlinkat(new_dirfd, "", linkpath, linksize) != st.st_size)
-				eerrorx("%s: symbolic link destination changed", applet);
-			/*
-			 * now follow the symlink.
-			 */
-			close(new_dirfd);
-		} else {
-			/* now walk down the directory path */
-			close(dirfd);
-			dirfd = new_dirfd;
-			free(linkpath);
-			linkpath = NULL;
-			item = strtok(NULL, "/");
-			components--;
-		}
-	}
-	free(path_dupe);
-	free(linkpath);
-	return dirfd;
-}
-
-static char *clean_path(char *path)
-{
-	char *ch;
-	char *ch2;
-	char *str;
-	str = xmalloc(strlen(path));
-	ch = path;
-	ch2 = str;
-	while (true) {
-		*ch2 = *ch;
-		ch++;
-		ch2++;
-		if (!*(ch-1))
-			break;
-		while (*(ch - 1) == '/' && *ch == '/')
-			ch++;
-	}
-	/* get rid of trailing / characters */
-	while ((ch = strrchr(str, '/'))) {
-		if (ch == str)
-			break;
-		if (!*(ch+1))
-			*ch = 0;
-		else
-			break;
-	}
-	return str;
-}
-
 static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
-	inode_t type, bool trunc, bool chowner, bool symlinks, bool selinux_on)
+	inode_t type, bool trunc, bool chowner, bool selinux_on)
 {
 	struct stat st;
-	char *name = NULL;
-	int dirfd;
 	int fd;
 	int flags;
 	int r;
@@ -200,16 +93,14 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 #endif
 	if (trunc)
 		flags |= O_TRUNC;
-	xasprintf(&name, "%s", basename_c(path));
+	readfd = open(path, readflags);
-	dirfd = get_dirfd(path, symlinks);
-	readfd = openat(dirfd, name, readflags);
 	if (readfd == -1 || (type == inode_file && trunc)) {
 		if (type == inode_file) {
 			einfo("%s: creating file", path);
 			if (!mode) /* 664 */
 				mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH;
 			u = umask(0);
-			fd = openat(dirfd, name, flags, mode);
+			fd = open(path, flags, mode);
 			umask(u);
 			if (fd == -1) {
 				eerror("%s: open: %s", applet, strerror(errno));
@@ -224,14 +115,14 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				mode = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH;
 			u = umask(0);
 			/* We do not recursively create parents */
-			r = mkdirat(dirfd, name, mode);
+			r = mkdir(path, mode);
 			umask(u);
 			if (r == -1 && errno != EEXIST) {
-				eerror("%s: mkdirat: %s", applet,
+				eerror("%s: mkdir: %s", applet,
 				    strerror (errno));
 				return -1;
 			}
-			readfd = openat(dirfd, name, readflags);
+			readfd = open(path, readflags);
 			if (readfd == -1) {
 				eerror("%s: unable to open directory: %s", applet,
 						strerror(errno));
@@ -249,7 +140,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				    strerror (errno));
 				return -1;
 			}
-			readfd = openat(dirfd, name, readflags);
+			readfd = open(path, readflags);
 			if (readfd == -1) {
 				eerror("%s: unable to open fifo: %s", applet,
 						strerror(errno));
@@ -368,10 +259,8 @@ int main(int argc, char **argv)
 	int retval = EXIT_SUCCESS;
 	bool trunc = false;
 	bool chowner = false;
-	bool symlinks = false;
 	bool writable = false;
 	bool selinux_on = false;
-	char *path = NULL;
 
 	applet = basename_c(argv[0]);
 	while ((opt = getopt_long(argc, argv, getoptstring,
@@ -404,11 +293,6 @@ int main(int argc, char **argv)
 				eerrorx("%s: owner `%s' not found",
 				    applet, optarg);
 			break;
-		case 's':
-#ifndef O_PATH
-			symlinks = true;
-#endif
-			break;
 		case 'W':
 			writable = true;
 			break;
@@ -434,14 +318,11 @@ int main(int argc, char **argv)
 		selinux_on = true;
 
 	while (optind < argc) {
-		path = clean_path(argv[optind]);
 		if (writable)
-			exit(!is_writable(path));
+			exit(!is_writable(argv[optind]));
-		if (do_check(path, uid, gid, mode, type, trunc, chowner,
+		if (do_check(argv[optind], uid, gid, mode, type, trunc, chowner, selinux_on))
-					symlinks, selinux_on))
 			retval = EXIT_FAILURE;
 		optind++;
-		free(path);
 	}
 
 	if (selinux_on)

src/rc/do_e.c

@@ -35,9 +35,9 @@
 
 const char *applet = NULL;
 
-static int syslog_decode(char *name, const CODE *codetab)
+static int syslog_decode(char *name, CODE *codetab)
 {
-	const CODE *c;
+	CODE *c;
 
 	if (isdigit((unsigned char)*name))
 		return atoi(name);

src/rc/openrc-init.c

@@ -19,7 +19,6 @@
  */
 
 #include <errno.h>
-#include <pwd.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -38,52 +37,46 @@
 
 #include "helpers.h"
 #include "rc.h"
-#include "rc-plugin.h"
 #include "rc-wtmp.h"
 #include "version.h"
 
 static const char *path_default = "/sbin:/usr/sbin:/bin:/usr/bin";
 static const char *rc_default_runlevel = "default";
 
-static void do_openrc(const char *runlevel)
+static pid_t do_openrc(const char *runlevel)
 {
 	pid_t pid;
-	sigset_t all_signals;
+	sigset_t signals;
-	sigset_t our_signals;
 
-	sigfillset(&all_signals);
-	/* block all signals */
-	sigprocmask(SIG_BLOCK, &all_signals, &our_signals);
 	pid = fork();
 	switch (pid) {
 		case -1:
 			perror("fork");
-			exit(1);
 			break;
 		case 0:
 			setsid();
 			/* unblock all signals */
-			sigprocmask(SIG_UNBLOCK, &all_signals, NULL);
+			sigemptyset(&signals);
+			sigprocmask(SIG_SETMASK, &signals, NULL);
 			printf("Starting %s runlevel\n", runlevel);
 			execlp("openrc", "openrc", runlevel, NULL);
 			perror("exec");
-			exit(1);
 			break;
 		default:
-			/* restore our signal mask */
-			sigprocmask(SIG_SETMASK, &our_signals, NULL);
-			while (waitpid(pid, NULL, 0) != pid)
-				if (errno == ECHILD)
-					break;
 			break;
 	}
+	return pid;
 }
 
 static void init(const char *default_runlevel)
 {
 	const char *runlevel = NULL;
-	do_openrc("sysinit");
+	pid_t pid;
-	do_openrc("boot");
+
+	pid = do_openrc("sysinit");
+	waitpid(pid, NULL, 0);
+	pid = do_openrc("boot");
+	waitpid(pid, NULL, 0);
 	if (default_runlevel)
 		runlevel = default_runlevel;
 	else
@@ -94,7 +87,8 @@ static void init(const char *default_runlevel)
 		printf("%s is an invalid runlevel\n", runlevel);
 		runlevel = rc_default_runlevel;
 	}
-	do_openrc(runlevel);
+	pid = do_openrc(runlevel);
+	waitpid(pid, NULL, 0);
 	log_wtmp("reboot", "~~", 0, RUN_LVL, "~~");
 }
 
@@ -106,9 +100,11 @@ static void handle_reexec(char *my_name)
 
 static void handle_shutdown(const char *runlevel, int cmd)
 {
+	pid_t pid;
 	struct timespec ts;
 
-	do_openrc(runlevel);
+	pid = do_openrc(runlevel);
+	while (waitpid(pid, NULL, 0) != pid);
 	printf("Sending the final term signal\n");
 	kill(-1, SIGTERM);
 	ts.tv_sec = 3;
@@ -120,68 +116,12 @@ static void handle_shutdown(const char *runlevel, int cmd)
 	reboot(cmd);
 }
 
-static void run_program(const char *prog)
-{
-	sigset_t full;
-	sigset_t old;
-	pid_t pid;
-
-	/* We need to block signals until we have forked */
-	sigfillset(&full);
-	sigprocmask(SIG_SETMASK, &full, &old);
-	pid = fork();
-	if (pid == -1) {
-		perror("init");
-		return;
-	}
-	if (pid == 0) {
-		/* Unmask signals */
-		sigprocmask(SIG_SETMASK, &old, NULL);
-		execl(prog, prog, (char *)NULL);
-		perror("init");
-		exit(1);
-	}
-	/* Unmask signals and wait for child */
-	sigprocmask(SIG_SETMASK, &old, NULL);
-	if (rc_waitpid(pid) == -1)
-		perror("init");
-}
-
-static void open_shell(void)
-{
-	const char *shell;
-	struct passwd *pw;
-
-#ifdef __linux__
-	const char *sys = rc_sys();
-
-	/* VSERVER systems cannot really drop to shells */
-	if (sys && strcmp(sys, RC_SYS_VSERVER) == 0)
-	{
-		execlp("halt", "halt", "-f", (char *) NULL);
-		perror("init");
-		return;
-	}
-#endif
-
-	shell = rc_conf_value("rc_shell");
-	/* No shell set, so obey env, then passwd, then default to /bin/sh */
-	if (!shell) {
-		shell = getenv("SHELL");
-		if (!shell) {
-			pw = getpwuid(getuid());
-			if (pw)
-				shell = pw->pw_shell;
-			if (!shell)
-				shell = "/bin/sh";
-		}
-	}
-	run_program(shell);
-}
-
 static void handle_single(void)
 {
-	do_openrc("single");
+	pid_t pid;
+
+	pid = do_openrc("single");
+	while (waitpid(pid, NULL, 0) != pid);
 }
 
 static void reap_zombies(void)
@@ -207,12 +147,6 @@ static void signal_handler(int sig)
 		case SIGINT:
 			handle_shutdown("reboot", RB_AUTOBOOT);
 			break;
-		case SIGTERM:
-#ifdef SIGPWR
-		case SIGPWR:
-#endif
-			handle_shutdown("shutdown", RB_HALT_SYSTEM);
-			break;
 		case SIGCHLD:
 			reap_zombies();
 			break;
@@ -275,10 +209,6 @@ int main(int argc, char **argv)
 	sigfillset(&signals);
 	sigdelset(&signals, SIGCHLD);
 	sigdelset(&signals, SIGINT);
-	sigdelset(&signals, SIGTERM);
-#ifdef SIGPWR
-	sigdelset(&signals, SIGPWR);
-#endif
 	sigprocmask(SIG_SETMASK, &signals, NULL);
 
 	/* install signal  handler */
@@ -286,10 +216,6 @@ int main(int argc, char **argv)
 	sa.sa_handler = signal_handler;
 	sigaction(SIGCHLD, &sa, NULL);
 	sigaction(SIGINT, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
-#ifdef SIGPWR
-	sigaction(SIGPWR, &sa, NULL);
-#endif
 	reboot(RB_DISABLE_CAD);
 
 	/* set default path */
@@ -323,11 +249,8 @@ int main(int argc, char **argv)
 			handle_shutdown("reboot", RB_AUTOBOOT);
 		else if (strcmp(buf, "reexec") == 0)
 			handle_reexec(argv[0]);
-		else if (strcmp(buf, "single") == 0) {
+		else if (strcmp(buf, "single") == 0)
 			handle_single();
-			open_shell();
-			init(default_runlevel);
-		}
 	}
 	return 0;
 }

src/rc/openrc-run.c

@@ -1152,7 +1152,7 @@ int main(int argc, char **argv)
 	}
 	lnk = xmalloc(4096);
 	memset(lnk, 0, 4096);
-	if (readlink(argv[1], lnk, 4096-1)) {
+	if (readlink(argv[1], lnk, 4096)) {
 		dir = dirname(path);
 		if (strchr(lnk, '/')) {
 			save = xstrdup(dir);
@@ -1223,6 +1223,7 @@ int main(int argc, char **argv)
 
 		/* Make our prefix string */
 		prefix = xmalloc(sizeof(char) * l + 1);
+		ll = strlen(applet);
 		memcpy(prefix, applet, ll);
 		memset(prefix + ll, ' ', l - ll);
 		memset(prefix + l, 0, 1);

src/rc/openrc-shutdown.c

@@ -35,9 +35,8 @@
 #include "rc.h"
 #include "helpers.h"
 #include "rc-misc.h"
-#include "rc-sysvinit.h"
-#include "rc-wtmp.h"
 #include "_usage.h"
+#include "rc-wtmp.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;
@@ -68,15 +67,7 @@ const char * const longopts_help[] = {
 	"write wtmp boot record and exit",
 	longopts_help_COMMON
 };
-const char *usagestring = "" \
+const char *usagestring = NULL;
-						   "Usage: openrc-shutdown -c | --cancel\n" \
-						   "   or: openrc-shutdown -R | --reexec\n" \
-						   "   or: openrc-shutdown -w | --write-only\n" \
-						   "   or: openrc-shutdown -H | --halt time\n" \
-						   "   or: openrc-shutdown -K | --kexec time\n" \
-						   "   or: openrc-shutdown -p | --poweroff time\n" \
-						   "   or: openrc-shutdown -r | --reboot time\n" \
-						   "   or: openrc-shutdown -s | --single time";
 const char *exclusive = "Select one of "
 	"--cancel, --halt, --kexec, --poweroff, --reexec, --reboot, --single or \n"
 	"--write-only";
@@ -169,7 +160,9 @@ static void sleep_no_interrupt(int seconds)
 
 static void stop_shutdown(int sig)
 {
-	(void) sig;
+	/* use the sig parameter so the compiler will not complain */
+	if (sig == SIGINT)
+		;
 	unlink(nologin_file);
 	unlink(shutdown_pid);
 einfo("Shutdown canceled");
@@ -329,30 +322,15 @@ int main(int argc, char **argv)
 	syslog(LOG_NOTICE, "The system will %s now", state);
 	unlink(nologin_file);
 	unlink(shutdown_pid);
-	if (do_halt) {
+	if (do_halt)
-		if (exists("/run/initctl")) {
-			sysvinit_setenv("INIT_HALT", "HALT");
-			sysvinit_runlevel('0');
-		} else
 		send_cmd("halt");
-	} else if (do_kexec)
+	else if (do_kexec)
 		send_cmd("kexec");
-	else if (do_poweroff) {
+	else if (do_poweroff)
-		if (exists("/run/initctl")) {
-			sysvinit_setenv("INIT_HALT", "POWEROFF");
-			sysvinit_runlevel('0');
-		} else
 		send_cmd("poweroff");
-	} else if (do_reboot) {
+	else if (do_reboot)
-		if (exists("/run/initctl"))
-			sysvinit_runlevel('6');
-		else
 		send_cmd("reboot");
-	} else if (do_single) {
+	else if (do_single)
-		if (exists("/run/initctl"))
-			sysvinit_runlevel('S');
-		else
 		send_cmd("single");
-	}
 	return 0;
 }

src/rc/rc-logger.h

@@ -13,8 +13,8 @@
 #ifndef RC_LOGGER_H
 #define RC_LOGGER_H
 
-extern pid_t rc_logger_pid;
+pid_t rc_logger_pid;
-extern int rc_logger_tty;
+int rc_logger_tty;
 extern bool rc_in_logger;
 
 void rc_logger_open(const char *runlevel);

src/rc/rc-schedules.c

@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
@@ -271,11 +270,8 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
 			einfo("Would send signal %d to PID %d", sig, pi->pid);
 			nkilled++;
 		} else {
-			if (sig) {
-				syslog(LOG_DEBUG, "Sending signal %d to PID %d", sig, pi->pid);
 			if (!quiet)
 				ebeginv("Sending signal %d to PID %d", sig, pi->pid);
-			}
 			errno = 0;
 			killed = (kill(pi->pid, sig) == 0 ||
 			    errno == ESRCH ? true : false);
@@ -283,9 +279,6 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
 				eendv(killed ? 0 : 1,
 				"%s: failed to send signal %d to PID %d: %s",
 				applet, sig, pi->pid, strerror(errno));
-			else if (!killed)
-				syslog(LOG_ERR, "Failed to send signal %d to PID %d: %s",
-						sig, pi->pid, strerror(errno));
 			if (!killed) {
 				nkilled = -1;
 			} else {
@@ -317,18 +310,12 @@ int run_stop_schedule(const char *applet,
 	if (!(pid > 0 || exec || uid || (argv && *argv)))
 		return 0;
 
-	if (exec) {
+	if (exec)
 		einfov("Will stop %s", exec);
-		syslog(LOG_DEBUG, "Will stop %s", exec);
+	if (pid > 0)
-	}
-	if (pid > 0) {
 		einfov("Will stop PID %d", pid);
-		syslog(LOG_DEBUG, "Will stop PID %d", pid);
+	if (uid)
-	}
-	if (uid) {
 		einfov("Will stop processes owned by UID %d", uid);
-		syslog(LOG_DEBUG, "Will stop processes owned by UID %d", uid);
-	}
 	if (argv && *argv) {
 		einfovn("Will stop processes of `");
 		if (rc_yesno(getenv("EINFO_VERBOSE"))) {

src/rc/rc-status.c

@@ -27,18 +27,12 @@
 #include "rc-misc.h"
 #include "_usage.h"
 
-enum format_t {
-	FORMAT_DEFAULT,
-	FORMAT_INI,
-};
-
 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "acf:lmrsSu" getoptstring_COMMON;
+const char *getoptstring = "aclmrsSu" getoptstring_COMMON;
 const struct option longopts[] = {
 	{"all",         0, NULL, 'a'},
 	{"crashed",     0, NULL, 'c'},
-	{"format",     1, NULL, 'f'},
 	{"list",        0, NULL, 'l'},
 	{"manual",        0, NULL, 'm'},
 	{"runlevel",    0, NULL, 'r'},
@@ -50,7 +44,6 @@ const struct option longopts[] = {
 const char * const longopts_help[] = {
 	"Show services from all run levels",
 	"Show crashed services",
-	"format status to be parsable (currently arg must be ini)",
 	"Show list of run levels",
 	"Show manually started services",
 	"Show the name of the current runlevel",
@@ -60,7 +53,7 @@ const char * const longopts_help[] = {
 	longopts_help_COMMON
 };
 const char *usagestring = ""						\
-	"Usage: rc-status [options] -f ini <runlevel>...\n"		\
+	"Usage: rc-status [options] <runlevel>...\n"		\
 	"   or: rc-status [options] [-a | -c | -l | -m | -r | -s | -u]";
 
 static RC_DEPTREE *deptree;
@@ -69,27 +62,19 @@ static RC_STRINGLIST *types;
 static RC_STRINGLIST *levels, *services, *tmp, *alist;
 static RC_STRINGLIST *sservices, *nservices, *needsme;
 
-static void print_level(const char *prefix, const char *level,
+static void
-		enum format_t format)
+print_level(const char *prefix, const char *level)
 {
-	switch (format) {
-	case FORMAT_DEFAULT:
 	if (prefix)
 		printf("%s ", prefix);
 	printf ("Runlevel: ");
 	if (isatty(fileno(stdout)))
 		printf("%s%s%s\n",
-					ecolor(ECOLOR_HILITE), level, ecolor(ECOLOR_NORMAL));
+		       ecolor(ECOLOR_HILITE),
+		       level,
+		       ecolor(ECOLOR_NORMAL));
 	else
 		printf("%s\n", level);
-		break;
-	case FORMAT_INI:
-		printf("%s", "[");
-		if (prefix)
-			printf("%s ", prefix);
-		printf("%s]\n", level);
-		break;
-	}
 }
 
 static char *get_uptime(const char *service)
@@ -140,13 +125,14 @@ static char *get_uptime(const char *service)
 	return uptime;
 }
 
-static void print_service(const char *service, enum format_t format)
+static void
+print_service(const char *service)
 {
 	char *status = NULL;
 	char *uptime = NULL;
 	char *child_pid = NULL;
 	char *start_time = NULL;
-	int cols;
+	int cols =  printf(" %s", service);
 	const char *c = ecolor(ECOLOR_GOOD);
 	RC_SERVICE state = rc_service_state(service);
 	ECOLOR color = ECOLOR_BAD;
@@ -190,22 +176,14 @@ static void print_service(const char *service, enum format_t format)
 		xasprintf(&status, " stopped ");
 
 	errno = 0;
-	switch (format) {
-	case FORMAT_DEFAULT:
-		cols =  printf(" %s", service);
 	if (c && *c && isatty(fileno(stdout)))
 		printf("\n");
 	ebracket(cols, color, status);
-		break;
-	case FORMAT_INI:
-		printf("%s = %s\n", service, status);
-		break;
-	}
 	free(status);
 }
 
-static void print_services(const char *runlevel, RC_STRINGLIST *svcs,
+static void
-		enum format_t format)
+print_services(const char *runlevel, RC_STRINGLIST *svcs)
 {
 	RC_STRINGLIST *l = NULL;
 	RC_STRING *s;
@@ -219,7 +197,7 @@ static void print_services(const char *runlevel, RC_STRINGLIST *svcs,
 		TAILQ_FOREACH(s, svcs, entries)
 			if (!runlevel ||
 			    rc_service_in_runlevel(s->value, runlevel))
-				print_service(s->value, format);
+				print_service(s->value);
 		return;
 	}
 	if (!types) {
@@ -239,12 +217,13 @@ static void print_services(const char *runlevel, RC_STRINGLIST *svcs,
 		if (!rc_stringlist_find(svcs, s->value))
 			continue;
 		if (!runlevel || rc_service_in_runlevel(s->value, runlevel))
-			print_service(s->value, format);
+			print_service(s->value);
 	}
 	rc_stringlist_free(l);
 }
 
-static void print_stacked_services(const char *runlevel, enum format_t format)
+static void
+print_stacked_services(const char *runlevel)
 {
 	RC_STRINGLIST *stackedlevels, *servicelist;
 	RC_STRING *stackedlevel;
@@ -253,9 +232,9 @@ static void print_stacked_services(const char *runlevel, enum format_t format)
 	TAILQ_FOREACH(stackedlevel, stackedlevels, entries) {
 		if (rc_stringlist_find(levels, stackedlevel->value) != NULL)
 			continue;
-		print_level("Stacked", stackedlevel->value, format);
+		print_level("Stacked", stackedlevel->value);
 		servicelist = rc_services_in_runlevel(stackedlevel->value);
-		print_services(stackedlevel->value, servicelist, format);
+		print_services(stackedlevel->value, servicelist);
 		rc_stringlist_free(servicelist);
 	}
 	rc_stringlist_free(stackedlevels);
@@ -266,8 +245,6 @@ int main(int argc, char **argv)
 {
 	RC_SERVICE state;
     RC_STRING *s, *l, *t, *level;
-	enum format_t format = FORMAT_DEFAULT;
-	bool levels_given = false;
 	bool show_all = false;
 	char *p, *runlevel = NULL;
 	int opt, retval = 0;
@@ -290,13 +267,6 @@ int main(int argc, char **argv)
 				}
 			goto exit;
 			/* NOTREACHED */
-		case 'f':
-			if (strcasecmp(optarg, "ini") == 0) {
-				format = FORMAT_INI;
-				setenv("EINFO_QUIET", "YES", 1);
-			} else
-				eerrorx("%s: invalid argument to --format switch\n", applet);
-			break;
 		case 'l':
 			levels = rc_runlevel_list();
 			TAILQ_FOREACH(l, levels, entries)
@@ -321,7 +291,7 @@ int main(int argc, char **argv)
 					free(s->value);
 					free(s);
 				}
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 		case 'r':
 			runlevel = rc_runlevel_get();
@@ -333,12 +303,12 @@ int main(int argc, char **argv)
 			TAILQ_FOREACH_SAFE(s, services, entries, t)
 				if (!rc_service_value_get(s->value, "child_pid"))
 					TAILQ_REMOVE(services, s, entries);
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 			/* NOTREACHED */
 		case 's':
 			services = rc_services_in_runlevel(NULL);
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 			/* NOTREACHED */
 		case 'u':
@@ -353,7 +323,7 @@ int main(int argc, char **argv)
 						break;
 					}
 			}
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 			/* NOTREACHED */
 
@@ -365,7 +335,6 @@ int main(int argc, char **argv)
 	opt = (optind < argc) ? 0 : 1;
 	while (optind < argc) {
 		if (rc_runlevel_exists(argv[optind])) {
-			levels_given = true;
 			rc_stringlist_add(levels, argv[optind++]);
 			opt++;
 		} else
@@ -382,21 +351,21 @@ int main(int argc, char **argv)
 	deptree = _rc_deptree_load(0, NULL);
 
 	TAILQ_FOREACH(l, levels, entries) {
-		print_level(NULL, l->value, format);
+		print_level(NULL, l->value);
 		services = rc_services_in_runlevel(l->value);
-		print_services(l->value, services, format);
+		print_services(l->value, services);
-		print_stacked_services(l->value, format);
+		print_stacked_services(l->value);
 		rc_stringlist_free(nservices);
 		nservices = NULL;
 		rc_stringlist_free(services);
 		services = NULL;
 	}
 
-	if (show_all || !levels_given) {
+	if (show_all || argc < 2) {
 		/* Show hotplugged services */
-		print_level("Dynamic", "hotplugged", format);
+		print_level("Dynamic", "hotplugged");
 		services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
-		print_services(NULL, services, format);
+		print_services(NULL, services);
 		rc_stringlist_free(services);
 		services = NULL;
 
@@ -453,10 +422,10 @@ int main(int argc, char **argv)
 		 * be added to the list
 		 */
 		unsetenv("RC_SVCNAME");
-		print_level("Dynamic", "needed/wanted", format);
+		print_level("Dynamic", "needed/wanted");
-		print_services(NULL, nservices, format);
+		print_services(NULL, nservices);
-		print_level("Dynamic", "manual", format);
+		print_level("Dynamic", "manual");
-		print_services(NULL, services, format);
+		print_services(NULL, services);
 	}
 
 exit:

src/rc/rc-sysvinit.c

@@ -1,102 +0,0 @@
-/*
- * rc-sysvinit.c
- * Helper to send a runlevel change to sysvinit
- */
-
-/*
- * Copyright (c) 2019 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "einfo.h"
-#include "rc-sysvinit.h"
-
-static void sysvinit_send_cmd(struct init_request *request)
-{
-	int fd;
-	char *p;
-	size_t bytes;
-	ssize_t r;
-
-	fd = open("/run/initctl", O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
-	if (fd < 0) {
-		if (errno != ENOENT)
-			eerror("Failed to open initctl fifo: %s", strerror(errno));
-		return;
-	}
-	p = (char *) request;
-	bytes = sizeof(*request);
-	do {
-		r = write(fd, p, bytes);
-		if (r < 0) {
-			if ((errno == EAGAIN) || (errno == EINTR))
-				continue;
-			eerror("Failed to write to /run/initctl: %s", strerror(errno));
-			return;
-		}
-		p += r;
-		bytes -= r;
-	} while (bytes > 0);
-}
-
-void sysvinit_runlevel(char rl)
-{
-	struct init_request request;
-
-	if (!rl)
-		return;
-
-	request = (struct init_request) {
-		.magic = INIT_MAGIC,
-		.sleeptime = 0,
-		.cmd = INIT_CMD_RUNLVL,
-		.runlevel = rl,
-	};
-	sysvinit_send_cmd(&request);
-		return;
-}
-
-/*
- *	Set environment variables in the init process.
- */
-void sysvinit_setenv(const char *name, const char *value)
-{
-	struct init_request	request;
-	size_t nl;
-	size_t vl;
-
-	memset(&request, 0, sizeof(request));
-	request.magic = INIT_MAGIC;
-	request.cmd = INIT_CMD_SETENV;
-	nl = strlen(name);
-	if (value)
-		vl = strlen(value);
-else
-		vl = 0;
-
-	if (nl + vl + 3 >= (int)sizeof(request.i.data))
-		return;
-
-	memcpy(request.i.data, name, nl);
-	if (value) {
-		request.i.data[nl] = '=';
-		memcpy(request.i.data + nl + 1, value, vl);
-	}
-	sysvinit_send_cmd(&request);
-	return;
-}

src/rc/rc-sysvinit.h

@@ -1,72 +0,0 @@
-/*
- * rc-sysvinit.h	- Interface to communicate with sysvinit via /run/initctl.
- */
-
-/*
- * Copyright (c) 2019 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#ifndef _RC_SYSVINIT_H
-#define _RC_SYSVINIT_H
-
-/*
- * The #defines and structures below are taken from initreq.h in
- * sysvinit and must be used by any program wishing to communicate with
- * it.
- */
-
-#define INIT_MAGIC 0x03091969
-#define INIT_CMD_START		0
-#define INIT_CMD_RUNLVL		1
-#define INIT_CMD_POWERFAIL	2
-#define INIT_CMD_POWERFAILNOW	3
-#define INIT_CMD_POWEROK	4
-#define INIT_CMD_BSD		5
-#define INIT_CMD_SETENV		6
-#define INIT_CMD_UNSETENV	7
-
-/*
- *	This is what BSD 4.4 uses when talking to init.
- *	Linux doesn't use this right now.
- */
-struct init_request_bsd {
-	char	gen_id[8];		/* Beats me.. telnetd uses "fe" */
-	char	tty_id[16];		/* Tty name minus /dev/tty      */
-	char	host[64];	/* Hostname                     */
-	char	term_type[16];		/* Terminal type                */
-	int	signal;			/* Signal to send               */
-	int	pid;			/* Process to send to           */
-	char	exec_name[128];	        /* Program to execute           */
-	char	reserved[128];		/* For future expansion.        */
-};
-
-/*
- *	Because of legacy interfaces, "runlevel" and "sleeptime"
- *	aren't in a seperate struct in the union.
- *
- *	The weird sizes are because init expects the whole
- *	struct to be 384 bytes.
- */
-struct init_request {
-	int	magic;			/* Magic number                 */
-	int	cmd;			/* What kind of request         */
-	int	runlevel;		/* Runlevel to change to        */
-	int	sleeptime;		/* Time between TERM and KILL   */
-	union {
-		struct init_request_bsd	bsd;
-		char			data[368];
-	} i;
-};
-
-void sysvinit_runlevel(char rl);
-void sysvinit_setenv(const char *name, const char *value);
-
-#endif

src/rc/rc.c

@@ -20,7 +20,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-static const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
+const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include <sys/types.h>
 #include <sys/ioctl.h>

src/rc/start-stop-daemon.c

@@ -389,11 +389,10 @@ int main(int argc, char **argv)
 			/* falls through */
 		case 'u':  /* --user <username>|<uid> */
 		{
-			char dummy[2];
 			p = optarg;
 			tmp = strsep(&p, ":");
 			changeuser = xstrdup(tmp);
-			if (sscanf(tmp, "%d%1s", &tid, dummy) != 1)
+			if (sscanf(tmp, "%d", &tid) != 1)
 				pw = getpwnam(tmp);
 			else
 				pw = getpwuid((uid_t)tid);
@@ -414,7 +413,7 @@ int main(int argc, char **argv)
 
 			if (p) {
 				tmp = strsep (&p, ":");
-				if (sscanf(tmp, "%d%1s", &tid, dummy) != 1)
+				if (sscanf(tmp, "%d", &tid) != 1)
 					gr = getgrnam(tmp);
 				else
 					gr = getgrgid((gid_t) tid);
@@ -493,7 +492,7 @@ int main(int argc, char **argv)
 			startas = optarg;
 			break;
 		case 'w':
-			if (sscanf(optarg, "%u", &start_wait) != 1)
+			if (sscanf(optarg, "%d", &start_wait) != 1)
 				eerrorx("%s: `%s' not a number",
 				    applet, optarg);
 			break;
@@ -629,7 +628,7 @@ int main(int argc, char **argv)
 	}
 	if (start && !exists(exec_file)) {
 		eerror("%s: %s does not exist", applet,
-		    exec_file ? exec_file : exec);
+		    *exec_file ? exec_file : exec);
 		free(exec_file);
 		exit(EXIT_FAILURE);
 	}
@@ -670,7 +669,7 @@ int main(int argc, char **argv)
 					nav[len++] = p;
 				for (i = 0; i < opt; i++)
 					nav[i + len] = argv[i];
-				nav[i + len] = NULL;
+				nav[i + len] = '\0';
 			}
 		}
 	}
@@ -864,8 +863,8 @@ int main(int argc, char **argv)
 
 		TAILQ_FOREACH(env, env_list, entries) {
 			if ((strncmp(env->value, "RC_", 3) == 0 &&
-				strncmp(env->value, "RC_SERVICE=", 11) != 0 &&
+				strncmp(env->value, "RC_SERVICE=", 10) != 0 &&
-				strncmp(env->value, "RC_SVCNAME=", 11) != 0) ||
+				strncmp(env->value, "RC_SVCNAME=", 10) != 0) ||
 				strncmp(env->value, "SSD_NICELEVEL=", 14) == 0 ||
 				strncmp(env->value, "SSD_IONICELEVEL=", 16) == 0)
 			{

src/rc/supervise-daemon.c

@@ -148,7 +148,6 @@ static char *fifopath = NULL;
 static int fifo_fd = 0;
 static char *pidfile = NULL;
 static char *svcname = NULL;
-static bool verbose = false;
 
 extern char **environ;
 
@@ -185,22 +184,13 @@ static void re_exec_supervisor(void)
 static void handle_signal(int sig)
 {
 	int serrno = errno;
-	pid_t pid;
 
 	switch (sig) {
 	case SIGALRM:
 		do_healthcheck = 1;
 		break;
 	case SIGCHLD:
-		if (exiting)
 		while (waitpid((pid_t)(-1), NULL, WNOHANG) > 0) {}
-		else {
-			while ((pid = waitpid((pid_t)(-1), NULL, WNOHANG|WNOWAIT)) > 0) {
-				if (pid == child_pid)
-					break;
-				pid = waitpid(pid, NULL, WNOHANG);
-			}
-		}
 		break;
 	case SIGTERM:
 		exiting = 1;
@@ -268,56 +258,6 @@ static char *make_cmdline(char **argv)
 	return cmdline;
 }
 
-static pid_t exec_command(const char *cmd)
-{
-	char *file;
-	pid_t pid = -1;
-	sigset_t full;
-	sigset_t old;
-	struct sigaction sa;
-
-	file = rc_service_resolve(svcname);
-	if (!exists(file)) {
-		free(file);
-		return 0;
-	}
-
-	/* We need to block signals until we have forked */
-	memset(&sa, 0, sizeof (sa));
-	sa.sa_handler = SIG_DFL;
-	sigemptyset(&sa.sa_mask);
-	sigfillset(&full);
-	sigprocmask(SIG_SETMASK, &full, &old);
-
-	pid = fork();
-	if (pid == 0) {
-		/* Restore default handlers */
-		sigaction(SIGCHLD, &sa, NULL);
-		sigaction(SIGHUP, &sa, NULL);
-		sigaction(SIGINT, &sa, NULL);
-		sigaction(SIGQUIT, &sa, NULL);
-		sigaction(SIGTERM, &sa, NULL);
-		sigaction(SIGUSR1, &sa, NULL);
-		sigaction(SIGWINCH, &sa, NULL);
-
-		/* Unmask signals */
-		sigprocmask(SIG_SETMASK, &old, NULL);
-
-		/* Safe to run now */
-		execl(file, file, cmd, (char *) NULL);
-		syslog(LOG_ERR, "unable to exec `%s': %s\n",
-		    file, strerror(errno));
-		_exit(EXIT_FAILURE);
-	}
-
-	if (pid == -1)
-		syslog(LOG_ERR, "fork: %s\n",strerror (errno));
-
-	sigprocmask(SIG_SETMASK, &old, NULL);
-	free(file);
-	return pid;
-}
-
 static void child_process(char *exec, char **argv)
 {
 	RC_STRINGLIST *env_list;
@@ -421,10 +361,9 @@ static void child_process(char *exec, char **argv)
 
 	TAILQ_FOREACH(env, env_list, entries) {
 		if ((strncmp(env->value, "RC_", 3) == 0 &&
-			strncmp(env->value, "RC_SERVICE=", 11) != 0 &&
+			strncmp(env->value, "RC_SERVICE=", 10) != 0 &&
-			strncmp(env->value, "RC_SVCNAME=", 11) != 0) ||
+			strncmp(env->value, "RC_SVCNAME=", 10) != 0) ||
-		    strncmp(env->value, "SSD_NICELEVEL=", 14) == 0 ||
+		    strncmp(env->value, "SSD_NICELEVEL=", 14) == 0)
-		    strncmp(env->value, "SSD_IONICELEVEL=", 16) == 0)
 		{
 			p = strchr(env->value, '=');
 			*p = '\0';
@@ -559,19 +498,18 @@ static void supervisor(char *exec, char **argv)
 		alarm(healthcheckdelay);
 	else if (healthchecktimer)
 		alarm(healthchecktimer);
+ fifo_fd = open(fifopath, O_RDONLY |O_NONBLOCK);
  failing = 0;
 	while (!exiting) {
 		healthcheck_respawn = 0;
-		fifo_fd = open(fifopath, O_RDONLY);
+		wait_pid = waitpid(child_pid, &i, WNOHANG);
-		if (fifo_fd > 0) {
 		memset(buf, 0, sizeof(buf));
+		if (fifo_fd >= 0) {
 			count = read(fifo_fd, buf, sizeof(buf) - 1);
-			close(fifo_fd);
 			if (count != -1)
 				buf[count] = 0;
-			if (count == 0)
+		}
-				continue;
+		if (strlen(buf) > 0) {
-			if (verbose)
 			syslog(LOG_DEBUG, "Received %s from fifo", buf);
 			if (strncasecmp(buf, "sig", 3) == 0) {
 				if ((sscanf(buf, "%s %d", cmd, &sig_send) == 2)
@@ -583,20 +521,18 @@ static void supervisor(char *exec, char **argv)
 								sig_send, child_pid);
 				}
 			}
-			continue;
 		}
 		if (do_healthcheck) {
 			do_healthcheck = 0;
 			alarm(0);
-			if (verbose)
 			syslog(LOG_DEBUG, "running health check for %s", svcname);
-			health_pid = exec_command("healthcheck");
+			health_pid = exec_service(svcname, "healthcheck");
 			health_status = rc_waitpid(health_pid);
 			if (WIFEXITED(health_status) && WEXITSTATUS(health_status) == 0)
 				alarm(healthchecktimer);
 			else {
 				syslog(LOG_WARNING, "health check for %s failed", svcname);
-				health_pid = exec_command("unhealthy");
+				health_pid = exec_service(svcname, "unhealthy");
 				rc_waitpid(health_pid);
 				syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
 				nkilled = run_stop_schedule(applet, NULL, NULL, child_pid, 0,
@@ -617,7 +553,6 @@ static void supervisor(char *exec, char **argv)
 				syslog(LOG_INFO, "killed %d processes", nkilled);
 			continue;
 		}
-		wait_pid = waitpid(child_pid, &i, WNOHANG);
 		if (wait_pid == child_pid) {
 			if (WIFEXITED(i))
 				syslog(LOG_WARNING, "%s, pid %d, exited with return code %d",
@@ -649,8 +584,6 @@ static void supervisor(char *exec, char **argv)
 			ts.tv_sec = respawn_delay;
 			ts.tv_nsec = 0;
 			nanosleep(&ts, NULL);
-			if (exiting)
-				continue;
 			child_pid = fork();
 			if (child_pid == -1) {
 				syslog(LOG_ERR, "%s: fork: %s", applet, strerror(errno));
@@ -726,7 +659,7 @@ int main(int argc, char **argv)
 		eerrorx("%s: The RC_SVCNAME environment variable is not set", applet);
 	openlog(applet, LOG_PID, LOG_DAEMON);
 
-	if (argc <= 1 || strcmp(argv[1], svcname))
+	if (argc >= 1 && svcname && strcmp(argv[1], svcname))
 		eerrorx("%s: the first argument is %s and must be %s",
 				applet, argv[1], svcname);
 
@@ -734,17 +667,6 @@ int main(int argc, char **argv)
 		if (sscanf(tmp, "%d", &nicelevel) != 1)
 			eerror("%s: invalid nice level `%s' (SSD_NICELEVEL)",
 			    applet, tmp);
-	if ((tmp = getenv("SSD_IONICELEVEL"))) {
-		int n = sscanf(tmp, "%d:%d", &ionicec, &ioniced);
-		if (n != 1 && n != 2)
-			eerror("%s: invalid ionice level `%s' (SSD_IONICELEVEL)",
-			    applet, tmp);
-		if (ionicec == 0)
-			ioniced = 0;
-		else if (ionicec == 3)
-			ioniced = 7;
-		ionicec <<= 13; /* class shift */
-	}
 
 	/* Get our user name and initial dir */
 	p = getenv("USER");
@@ -852,7 +774,7 @@ int main(int argc, char **argv)
 
 		case 'm':  /* --respawn-max count */
 			n = sscanf(optarg, "%d", &respawn_max);
-			if (n	!= 1 || respawn_max < 0)
+			if (n	!= 1 || respawn_max < 1)
 				eerrorx("Invalid respawn-max value '%s'", optarg);
 			break;
 
@@ -869,11 +791,10 @@ int main(int argc, char **argv)
 
 		case 'u':  /* --user <username>|<uid> */
 		{
-			char dummy[2];
 			p = optarg;
 			tmp = strsep(&p, ":");
 			changeuser = xstrdup(tmp);
-			if (sscanf(tmp, "%d%1s", &tid, dummy) != 1)
+			if (sscanf(tmp, "%d", &tid) != 1)
 				pw = getpwnam(tmp);
 			else
 				pw = getpwuid((uid_t)tid);
@@ -894,7 +815,7 @@ int main(int argc, char **argv)
 
 			if (p) {
 				tmp = strsep (&p, ":");
-				if (sscanf(tmp, "%d%1s", &tid, dummy) != 1)
+				if (sscanf(tmp, "%d", &tid) != 1)
 					gr = getgrnam(tmp);
 				else
 					gr = getgrgid((gid_t) tid);
@@ -922,7 +843,6 @@ int main(int argc, char **argv)
 		case_RC_COMMON_GETOPT
 		}
 
-	verbose = rc_yesno(getenv ("EINFO_VERBOSE"));
 	endpwent();
 	argc -= optind;
 	argv += optind;
@@ -1002,7 +922,7 @@ int main(int argc, char **argv)
 			}
 			if (!exists(exec_file)) {
 				eerror("%s: %s does not exist", applet,
-				    exec_file ? exec_file : exec);
+				    *exec_file ? exec_file : exec);
 				free(exec_file);
 				exit(EXIT_FAILURE);
 			}

src/test/.gitignore

@@ -0,0 +1,6 @@
+einfo.data.out
+einfo.funcs.out
+librc.funcs.hidden.out
+librc.funcs.hidden.list
+rc.data.out
+rc.funcs.out

src/test/einfo.data.list

@@ -0,0 +1 @@
+EINFO_1.0

src/test/einfo.funcs.list

@@ -0,0 +1,52 @@
+ebegin
+ebegin@@EINFO_1.0
+ebeginv
+ebeginv@@EINFO_1.0
+ebracket
+ebracket@@EINFO_1.0
+ecolor
+ecolor@@EINFO_1.0
+eend
+eend@@EINFO_1.0
+eendv
+eendv@@EINFO_1.0
+eerror
+eerror@@EINFO_1.0
+eerrorn
+eerrorn@@EINFO_1.0
+eerrorx
+eerrorx@@EINFO_1.0
+eindent
+eindent@@EINFO_1.0
+eindentv
+eindentv@@EINFO_1.0
+einfo
+einfo@@EINFO_1.0
+einfon
+einfon@@EINFO_1.0
+einfov
+einfov@@EINFO_1.0
+einfovn
+einfovn@@EINFO_1.0
+elog
+elog@@EINFO_1.0
+eoutdent
+eoutdent@@EINFO_1.0
+eoutdentv
+eoutdentv@@EINFO_1.0
+eprefix
+eprefix@@EINFO_1.0
+ewarn
+ewarn@@EINFO_1.0
+ewarnn
+ewarnn@@EINFO_1.0
+ewarnv
+ewarnv@@EINFO_1.0
+ewarnvn
+ewarnvn@@EINFO_1.0
+ewarnx
+ewarnx@@EINFO_1.0
+ewend
+ewend@@EINFO_1.0
+ewendv
+ewendv@@EINFO_1.0

src/test/rc.data.list

@@ -0,0 +1,3 @@
+RC_1.0
+rc_environ_fd
+rc_environ_fd@@RC_1.0

src/test/rc.funcs.list

@@ -0,0 +1,116 @@
+rc_conf_value
+rc_conf_value@@RC_1.0
+rc_config_list
+rc_config_list@@RC_1.0
+rc_config_load
+rc_config_load@@RC_1.0
+rc_config_value
+rc_config_value@@RC_1.0
+rc_deptree_depend
+rc_deptree_depend@@RC_1.0
+rc_deptree_depends
+rc_deptree_depends@@RC_1.0
+rc_deptree_free
+rc_deptree_free@@RC_1.0
+rc_deptree_load
+rc_deptree_load@@RC_1.0
+rc_deptree_load_file
+rc_deptree_load_file@@RC_1.0
+rc_deptree_order
+rc_deptree_order@@RC_1.0
+rc_deptree_update
+rc_deptree_update@@RC_1.0
+rc_deptree_update_needed
+rc_deptree_update_needed@@RC_1.0
+rc_find_pids
+rc_find_pids@@RC_1.0
+rc_getfile
+rc_getfile@@RC_1.0
+rc_getline
+rc_getline@@RC_1.0
+rc_newer_than
+rc_newer_than@@RC_1.0
+rc_older_than
+rc_older_than@@RC_1.0
+rc_proc_getent
+rc_proc_getent@@RC_1.0
+rc_runlevel_exists
+rc_runlevel_exists@@RC_1.0
+rc_runlevel_get
+rc_runlevel_get@@RC_1.0
+rc_runlevel_list
+rc_runlevel_list@@RC_1.0
+rc_runlevel_set
+rc_runlevel_set@@RC_1.0
+rc_runlevel_stack
+rc_runlevel_stack@@RC_1.0
+rc_runlevel_stacks
+rc_runlevel_stacks@@RC_1.0
+rc_runlevel_starting
+rc_runlevel_starting@@RC_1.0
+rc_runlevel_stopping
+rc_runlevel_stopping@@RC_1.0
+rc_runlevel_unstack
+rc_runlevel_unstack@@RC_1.0
+rc_service_add
+rc_service_add@@RC_1.0
+rc_service_daemon_set
+rc_service_daemon_set@@RC_1.0
+rc_service_daemons_crashed
+rc_service_daemons_crashed@@RC_1.0
+rc_service_delete
+rc_service_delete@@RC_1.0
+rc_service_description
+rc_service_description@@RC_1.0
+rc_service_exists
+rc_service_exists@@RC_1.0
+rc_service_extra_commands
+rc_service_extra_commands@@RC_1.0
+rc_service_in_runlevel
+rc_service_in_runlevel@@RC_1.0
+rc_service_mark
+rc_service_mark@@RC_1.0
+rc_service_resolve
+rc_service_resolve@@RC_1.0
+rc_service_schedule_clear
+rc_service_schedule_clear@@RC_1.0
+rc_service_schedule_start
+rc_service_schedule_start@@RC_1.0
+rc_service_started_daemon
+rc_service_started_daemon@@RC_1.0
+rc_service_state
+rc_service_state@@RC_1.0
+rc_service_value_get
+rc_service_value_get@@RC_1.0
+rc_service_value_set
+rc_service_value_set@@RC_1.0
+rc_services_in_runlevel
+rc_services_in_runlevel@@RC_1.0
+rc_services_in_runlevel_stacked
+rc_services_in_runlevel_stacked@@RC_1.0
+rc_services_in_state
+rc_services_in_state@@RC_1.0
+rc_services_scheduled
+rc_services_scheduled@@RC_1.0
+rc_services_scheduled_by
+rc_services_scheduled_by@@RC_1.0
+rc_stringlist_add
+rc_stringlist_add@@RC_1.0
+rc_stringlist_addu
+rc_stringlist_addu@@RC_1.0
+rc_stringlist_delete
+rc_stringlist_delete@@RC_1.0
+rc_stringlist_find
+rc_stringlist_find@@RC_1.0
+rc_stringlist_free
+rc_stringlist_free@@RC_1.0
+rc_stringlist_new
+rc_stringlist_new@@RC_1.0
+rc_stringlist_sort
+rc_stringlist_sort@@RC_1.0
+rc_stringlist_split
+rc_stringlist_split@@RC_1.0
+rc_sys
+rc_sys@@RC_1.0
+rc_yesno
+rc_yesno@@RC_1.0

src/test/runtests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-top_srcdir=${top_srcdir:-..}
+top_srcdir=${top_srcdir:-../..}
 . ${top_srcdir}/test/setup_env.sh
 
 libeinfo_srcdir="${srcdir}/../libeinfo"
@@ -27,6 +27,53 @@ fail_on_out() {
 	fi
 }
 
+ebegin "Checking exported symbols in libeinfo.so (data)"
+checkit einfo.data $(
+readelf -Ws ${libeinfo_builddir}/libeinfo.so \
+	| awk '$4 == "OBJECT" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u
+)
+
+ebegin "Checking exported symbols in libeinfo.so (functions)"
+checkit einfo.funcs $(
+readelf -Ws ${libeinfo_builddir}/libeinfo.so \
+	| awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u \
+	| egrep -v \
+		-e '^_(init|fini)$'
+)
+
+ebegin "Checking exported symbols in librc.so (data)"
+checkit rc.data $(
+readelf -Ws ${librc_builddir}/librc.so \
+	| awk '$4 == "OBJECT" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u
+)
+
+ebegin "Checking exported symbols in librc.so (functions)"
+checkit rc.funcs $(
+readelf -Ws ${librc_builddir}/librc.so \
+	| awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u \
+	| egrep -v \
+		-e '^_(init|fini)$'
+)
+
+ebegin "Checking hidden functions in librc.so"
+sed -n '/^librc_hidden_proto/s:.*(\(.*\))$:\1:p' ${librc_srcdir}/librc.h \
+	| LC_ALL=C sort -u \
+	> librc.funcs.hidden.list
+readelf -Wr $(grep -l '#include[[:space:]]"librc\.h"' ${librc_srcdir}/*.c | sed 's:\.c$:.o:') \
+	| egrep -v -e 'R_PARISC_(DP|SEG)REL' \
+	| awk '$5 ~ /^rc_/ {print $5}' \
+	| LC_ALL=C sort -u \
+	| egrep -v '^rc_environ_fd$' \
+	> librc.funcs.hidden.out
+syms=$(diff -u librc.funcs.hidden.list librc.funcs.hidden.out | sed -n '/^+[^+]/s:^+::p')
+[ -z "${syms}" ]
+eend $? "Missing hidden defs:"$'\n'"${syms}"
+: $(( ret += $? ))
+
 ebegin "Checking trailing whitespace in code"
 # XXX: Should we check man pages too ?
 out=$(cd ${top_srcdir}; find */ \

supervise-daemon-guide.md

@@ -92,8 +92,7 @@ respawn_max=x
 ```
 
 This is the maximum number of times to respawn a supervised process
-during the given respawn period.
+during the given respawn period. The default is unlimited.
-The default is 10. 0 means unlimited.
 
 ``` sh
 respawn_period=seconds
@@ -102,10 +101,6 @@ respawn_period=seconds
 This works in conjunction with respawn_max and respawn_delay above to
 decide if a process should not be respawned for some reason.
 
-For example, if respawn period is 10 and respawn_max is 2, the process
+For example, if respawn_period is 60, respawn_max is 2 and respawn_delay
-would need to die 3 times within 10 seconds to no longer be respawned.
+is 3 and a process dies more than 4 times, the process will not be
-Note that respawn_delay will delay all of this, so in the above scenario
+respawned and the supervisor will terminate.
-a respawn_delay of greater than 5 will cause infinite respawns.
-
-By default, this is unset and respawn_max applies to the entire lifetime
-of the service.

support/sysvinit/Makefile

@@ -2,7 +2,7 @@ MK=	../../mk
 include ${MK}/os.mk
 
 DIR=	${DATADIR}/support/sysvinit
-INC=	halt.sh inittab README.md
+INC=	inittab README.md
 
 
 include ${MK}/scripts.mk

support/sysvinit/halt.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ "$INIT_HALT" = HALT ]; then
-	exec /sbin/halt -dhn
-else
-	exec /sbin/poweroff -dhn
-fi

support/sysvinit/inittab

@@ -10,15 +10,13 @@ si::sysinit:/sbin/openrc sysinit
 # Further system initialization, brings up the boot runlevel.
 rc::bootwait:/sbin/openrc boot
 
-l0u:0:wait:/sbin/telinit u
 l0:0:wait:/sbin/openrc shutdown
-l0s:0:wait:/sbin/halt.sh
+l0s:0:wait:/sbin/halt -dhip
 l1:S1:wait:/sbin/openrc single
 l2:2:wait:/sbin/openrc nonetwork
 l3:3:wait:/sbin/openrc default
 l4:4:wait:/sbin/openrc default
 l5:5:wait:/sbin/openrc default
-l6u:6:wait:/sbin/telinit u
 l6:6:wait:/sbin/openrc reboot
 l6r:6:wait:/sbin/reboot -d
 #z6:6:respawn:/sbin/sulogin
@@ -36,8 +34,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux
 c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 
 # SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100
+#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100
+#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
 
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now

test/skel.runtests.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# top_srcdir=${top_srcdir:-SET/THIS/PATH/OK!?}
+. ${top_srcdir}/test/setup_env.sh
+

test/travis.sh

@@ -13,9 +13,11 @@ set -e
 set -u
 set -x
 
-# These are steps to run on Cirrus CI under a jailed FreeBSD system.
+# These are steps to run on TravisCI under a containerized Ubuntu system.
-# See $TOP/.cirrus.yml for more info about the Cirrus CI setup.
+# See $TOP/.travis.yml for more info about the TravisCI setup.
 
-cpus=$(getconf NPROCESSORS_CONF || echo 1)
+cpus=$(getconf _NPROCESSORS_CONF || echo 1)
-gmake -j"${cpus}" -O
+# make on TravisCI doesn't support -O yet
-gmake test
+make -j"${cpus}"
+
+make test

user-guide.md

@@ -85,8 +85,8 @@ runlevel; this will start and stop services as needed.
 Managing runlevels is usually done through the `rc-update` helper, but could of 
 course be done by hand if desired.
 e.g. `rc-update add nginx default` - add nginx to the default runlevel
-Note: `rc-update` will not start nginx! You'd still have to trigger `rc`, or run
+Note: This will not auto-start nginx! You'd still have to trigger `rc` or run 
-the service script by hand, or start it with `rc-service nginx start`.
+the service script by hand.
 
 FIXME: Document stacked runlevels
 
@@ -107,7 +107,7 @@ START_OPTS="--extraparameter sausage"
 
 init.d/foo:
 start() {
-	/usr/sbin/foo-daemon ${START_OPTS}
+	/usr/sbin/foo-daemon ${STARTOPTS}
 }
 ```
 
@@ -137,7 +137,7 @@ Setting `ulimit` and `nice` values per service can be done through the
 
 Under Linux, OpenRC can use cgroups for process management as well. Once
 the kernel is configured appropriately, the `rc_cgroup_mode` setting in
-/etc/rc.conf should be used to control whether cgroups version one,
+/etc/rc.conf should be used to control whether cgroups version one,,
 two, or both are used. The default is to use both if they are available.
 
 By changing certain settings in the service's `conf.d` file limits can be

zsh-completion/_rc-service

@@ -1,37 +1,27 @@
 #compdef rc-service
 
-_rc_services() {
+if (( CURRENT == 2 )); then
-  if [[ -n "${opt_args[(i)-l|--list]}" ]]; then
+  _arguments -s \
-    _nothing
+    '(-e --exists)'{-e,--exists}"[tests if the service exists or not]" \
-  else
-    _values 'service' $(rc-service -l)
-  fi
-}
-
-_rc_actions() {
-  local service="${line[1]}"
-
-  if [[ -n "${opt_args[(i)-e|--exists|-r|--resolve]}" ]] || ! $(rc-service -e $service) ; then
-    _nothing
-  else
-    local -a actions=(${(f)"$(rc-service -C $service describe 2>&1)"})
-    shift actions
-    actions=(${actions# \* })
-    actions=(${actions/:*})
-    actions=(stop start restart describe zap ${actions[@]})
-    _describe -V 'action' actions
-  fi
-
-}
-
-_arguments -C -s \
-  '(-e --exists)'{-e,--exists}'[tests if the service exists or not]' \
     '(-l --list)'{-l,--list}'[list all available services]' \
     '(-r --resolve)'{-r,--resolve}'[resolve the service name to an init script]' \
     '(-C --nocolor)'{-C,--nocolor}'[Disable color output]' \
     '(-v --verbose)'{-v,--verbose}'[Run verbosely]' \
-  '(-q --quiet)'{-q,--quiet}'[Run quietly]' \
+    '(-q --quiet)'{-q,--quiet}'[Run quietly]'
-  '1:service:_rc_services' \
+  _values "service" $(rc-service --list)
-  '2:action:_rc_actions'
+else
+  case $words[2] in
+    -e|--exists|-r|--resolve)
+      (( CURRENT > 3 )) && return 0
+	  _values "service" $(rc-service --list)
+      ;;
+    -*)
+          return 0
+          ;;
+    *)
+      _values "action" stop start restart describe zap
+  ;;
+  esac
+fi
 
 # vim: set et sw=2 ts=2 ft=zsh: