version 0.47.1

Thanks to vapier for noticing.

.cirrus.yml

@@ -4,8 +4,8 @@
 test_task:
   freebsd_instance:
     matrix:
-      image: freebsd-13-0-release-amd64
-      image: freebsd-12-3-release-amd64
+      image: freebsd-13-1-release-amd64
+      image: freebsd-12-4-release-amd64
   env:
     OS: FreeBSD
   procfs_script: >

CODE_OF_CONDUCT.md

@@ -0,0 +1,142 @@
+# OpenRC Code of Conduct
+
+This code of conduct outlines our expectations for participants within the
+community, as well as steps for reporting unacceptable behavior. We are
+committed to providing a welcoming and inspiring community for all and
+expect our code of conduct to be honored. Anyone who violates this code
+of conduct may be banned from the community.
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement via integrated
+"Report Content" functionality.
+See the GitHub documentation for more details:
+https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam
+
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
+

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008, Roy Marples <roy@marples.name>
-Copyright (c) 2007-2015, the OpenRC authors
+Copyright (c) 2007-2023, the OpenRC authors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

NEWS.md

@@ -4,6 +4,11 @@ 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.47
+
+This release is primarily an internal cleanup release.
+The only user-visible difference is that unicode is now on by default.
+
 ## OpenRC 0.46
 
 The path for the reference file for the swclock service is now

bash-completion/rc-service

@@ -85,9 +85,9 @@ _rc_service()
 	else
 		# no option was typed
 		if [[ ${COMP_CWORD} -eq 1 ]]; then			  # if first word typed
-			words="$(rc-service --list | grep ^${cur})"		  # complete for init scripts
-			COMPREPLY=($(for i in ${words} ; do \
-			[[ ${i} == ${cur}* ]] && echo ${i} ; \
+			# complete for init scripts
+			COMPREPLY=($(for i in $(rc-service --list) ; do \
+				[[ ${i} == "${cur}"* ]] && echo ${i} ; \
 			done))
 			return 0
 		elif [[ ${COMP_CWORD} -eq 2 ]] && [[ ${prev} != -* ]]; then # if second word typed and we didn't type in a function
@@ -105,9 +105,8 @@ _rc_service()
 	fi
 	if [[ ${action} == '--exists' ]] || [[ ${action} == '-e' ]] || \
 		[[ ${action} == '--resolve' ]]  || [[ ${action} == '-r' ]]; then
-		words="$(rc-service --list | grep ^${cur})"
-		COMPREPLY=($(for i in ${words} ; do \
-			[[ ${i} == ${cur}* ]] && echo ${i} ; \
+		COMPREPLY=($(for i in $(rc-service --list) ; do \
+			[[ ${i} == "${cur}"* ]] && echo ${i} ; \
 		done))
 		return 0
 	fi

etc/rc.conf

@@ -88,8 +88,8 @@
 # MISC CONFIGURATION VARIABLES
 # There variables are shared between many init scripts
 
-# Set unicode to YES to turn on unicode support for keyboards and screens.
-#unicode="NO"
+# Set unicode to NO to turn off unicode support for keyboards and screens.
+#unicode="YES"
 
 # This is how long fuser should wait for a remote server to respond. The
 # default is 60 seconds, but  it can be adjusted here.
@@ -97,8 +97,8 @@
 
 # Below is the default list of network fstypes.
 #
-# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
-# nfs nfs4 ocfs2 shfs smbfs
+# afs ceph cifs coda davfs fuse fuse.glusterfs fuse.sshfs gfs glusterfs lustre
+# ncpfs nfs nfs4 ocfs2 shfs smbfs
 #
 # If you would like to add to this list, you can do so by adding your
 # own fstypes to the following variable.
@@ -116,12 +116,13 @@
 
 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
-#SSD_NICELEVEL="0"
+# These need to be exported
+#export SSD_NICELEVEL="0"
 # Or the ionice level. The format is class[:data] , just like the
 # --ionice start-stop-daemon parameter.
-#SSD_IONICELEVEL="0:0"
+#export SSD_IONICELEVEL="0:0"
 # Or the OOM score adjustment.
-#SSD_OOM_SCORE_ADJ="0"
+#export SSD_OOM_SCORE_ADJ="0"
 
 # Pass ulimit parameters
 # If you are using bash in POSIX mode for your shell, note that the

init.d/keymaps.in

@@ -42,7 +42,7 @@ start()
 	fi
 
 	local wkeys= kmode="-a" msg="ASCII"
-	if yesno $unicode; then
+	if yesno ${unicode:-yes}; then
 		kmode="-u"
 		msg="UTF-8"
 	fi

init.d/save-termencoding.in

@@ -25,7 +25,7 @@ start()
 	# Save the encoding for use immediately at boot
 	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		if yesno ${unicode:-${UNICODE}}; then
+		if yesno ${unicode:-yes}; then
 			echo "" > "$RC_LIBEXECDIR"/console/unicode
 		else
 			rm -f "$RC_LIBEXECDIR"/console/unicode

init.d/termencoding.in

@@ -28,7 +28,7 @@ start()
 	# Set terminal encoding to either ASCII or UNICODE.
 	# See utf-8(7) for more information.
 	local termencoding="%@" termmsg="ASCII"
-	if yesno ${unicode}; then
+	if yesno ${unicode:-yes}; then
 		termencoding="%G"
 		termmsg="UTF-8"
 	fi
@@ -43,7 +43,7 @@ start()
 	# Save the encoding for use immediately at boot
 	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		if yesno ${unicode:-${UNICODE}}; then
+		if yesno ${unicode:-yes}; then
 			echo "" > "$RC_LIBEXECDIR"/console/unicode
 		else
 			rm -f "$RC_LIBEXECDIR"/console/unicode

man/openrc.8

@@ -37,11 +37,11 @@ Brings up any system specific stuff such as
 and optionally
 .Pa /sys
 for Linux based systems. It also mounts
-.Pa /lib/rc/init.d
+.Pa /run/openrc
 as a ramdisk using tmpfs where available unless / is mounted rw at boot.
 .Nm
 uses
-.Pa /lib/rc/init.d
+.Pa /run/openrc
 to hold state information about the services it runs.
 sysinit always runs when the host first starts should not be run again.
 .It Ar boot

man/rc_deptree.3

@@ -47,7 +47,7 @@ services.
 .Pp
 .Fn rc_deptree_update
 updates the service dependency tree, normally
-.Pa /lib/rc/init.d/deptree .
+.Pa /run/openrc/deptree .
 .Fn rc_deptree_update_needed
 checks to see if the dependency tree needs updated based on the mtime of it
 compared to

man/rc_service.3

@@ -204,7 +204,7 @@ When a function fails it should either return false or NULL and set
 .Va errno
 unless specified otherwise as above.
 .Sh FILES
-.Pa /lib/rc/init.d
+.Pa /run/openrc
 normally holds the volatile state data for services on a RAM backed disk.
 .Sh SEE ALSO
 .Xr errno 3 ,

meson.build

@@ -1,5 +1,5 @@
 project('OpenRC', 'c',
-  version : '0.46',
+  version : '0.47.1',
   license: 'BSD-2',
   default_options : [
     'c_std=c99',
@@ -192,6 +192,14 @@ if cc.compiles(malloc_attribute_test, name : 'malloc attribute with arguments')
   add_project_arguments('-DHAVE_MALLOC_EXTENDED_ATTRIBUTE', language: 'c')
 endif
 
+if cc.has_function('closefrom', prefix: '#define _GNU_SOURCE\n#include <unistd.h>')
+  add_project_arguments('-DHAVE_CLOSEFROM', language: 'c')
+endif
+if cc.has_function('close_range', prefix: '#define _GNU_SOURCE\n#include <unistd.h>') and \
+    cc.has_header_symbol('unistd.h', 'CLOSE_RANGE_CLOEXEC', prefix: '#define _GNU_SOURCE')
+  add_project_arguments('-DHAVE_CLOSE_RANGE_CLOEXEC', language: 'c')
+endif
+
 incdir = include_directories('src/shared')
 einfo_incdir = include_directories('src/libeinfo')
 rc_incdir = include_directories('src/librc')

sh/init.sh.Linux.in

@@ -79,6 +79,7 @@ elif ! mountinfo -q /run; then
 			exit 1
 		fi
 	fi
+	eend
 fi
 
 checkpath -d "$RC_SVCDIR"

sh/rc-functions.sh

@@ -2,8 +2,10 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-net_fs_list="afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
-ncpfs nfs nfs4 ocfs2 shfs smbfs"
+net_fs_list="
+	afs ceph cifs coda davfs fuse fuse.glusterfs fuse.sshfs gfs glusterfs lustre
+	ncpfs nfs nfs4 ocfs2 shfs smbfs
+"
 is_net_fs()
 {
 	[ -z "$1" ] && return 1

src/checkpath/checkpath.c

@@ -17,25 +17,24 @@
  */
 
 #define _GNU_SOURCE
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
-#include <libgen.h>
 #include <pwd.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "einfo.h"
-#include "rc.h"
 #include "misc.h"
 #include "selinux.h"
 #include "_usage.h"
+#include "helpers.h"
 
 typedef enum {
 	inode_unknown = 0,
@@ -89,7 +88,7 @@ static int get_dirfd(char *path, bool symlinks)
 
 	if (!path || *path != '/')
 		eerrorx("%s: empty or relative path", applet);
-	dirfd = openat(dirfd, "/", O_RDONLY);
+	dirfd = openat(AT_FDCWD, "/", O_RDONLY);
 	if (dirfd == -1)
 		eerrorx("%s: unable to open the root directory: %s",
 				applet, strerror(errno));
@@ -285,7 +284,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 			return -1;
 		}
 
-		if (mode && (st.st_mode & 0777) != mode) {
+		if (mode && (st.st_mode & 07777) != mode) {
 			if ((type != inode_dir) && (st.st_nlink > 1)) {
 				eerror("%s: chmod: Too many hard links to %s", applet, path);
 				close(readfd);

src/einfo/einfo.c

@@ -12,20 +12,17 @@
 
 #define SYSLOG_NAMES
 
-#include <sys/types.h>
 #include <sys/time.h>
-
 #include <errno.h>
 #include <ctype.h>
 #include <inttypes.h>
-#include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
 #include <syslog.h>
 #include <time.h>
-#include <unistd.h>
+#include <strings.h>
 
 #include "einfo.h"
 #include "helpers.h"

src/fstabinfo/fstabinfo.c

@@ -16,13 +16,13 @@
  */
 
 #include <sys/wait.h>
-
 #include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 /* Yay for linux and its non liking of POSIX functions.
    Okay, we could use getfsent but the man page says use getmntent instead
@@ -30,6 +30,7 @@
 #ifdef __linux__
 #  define HAVE_GETMNTENT
 #  include <mntent.h>
+
 #  define ENT mntent
 #  define START_ENT fp = setmntent ("/etc/fstab", "r");
 #  define GET_ENT getmntent (fp)
@@ -43,6 +44,7 @@
 #else
 #  define HAVE_GETFSENT
 #  include <fstab.h>
+
 #  define ENT fstab
 #  define START_ENT
 #  define GET_ENT getfsent ()
@@ -58,8 +60,8 @@
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
-#include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;

src/is_newer_than/is_newer_than.c

@@ -10,13 +10,9 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <errno.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "rc.h"
-#include "misc.h"
 
 int main(int argc, char **argv)
 {

src/is_older_than/is_older_than.c

@@ -10,13 +10,9 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <errno.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "rc.h"
-#include "misc.h"
 
 int main(int argc, char **argv)
 {

src/kill_all/kill_all.c

@@ -19,7 +19,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
-#include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,11 +27,12 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <stdbool.h>
 
 #include "einfo.h"
 #include "rc.h"
-#include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = "[signal number]";

src/libeinfo/einfo.h

@@ -13,13 +13,8 @@
 #ifndef __EINFO_H__
 #define __EINFO_H__
 
-#if defined(__GNUC__)
-# define EINFO_PRINTF(a, b)  __attribute__((__format__(__printf__, a, b)))
-# define EINFO_XPRINTF(a, b) __attribute__((__noreturn__,__format__(__printf__, a, b)))
-#else
-# define EINFO_PRINTF(a, b)
-# define EINFO_XPRINTF(a, b)
-#endif
+#define EINFO_PRINTF(a, b)  __attribute__((__format__(__printf__, a, b)))
+#define EINFO_XPRINTF(a, b) __attribute__((__noreturn__, __format__(__printf__, a, b)))
 
 #include <sys/types.h>
 #include <stdbool.h>

src/libeinfo/libeinfo.c

@@ -15,16 +15,12 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-
 #include <errno.h>
-#include <fcntl.h>
 #include <inttypes.h>
-#include <limits.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -677,15 +673,14 @@ ewarn(const char *EINFO_RESTRICT fmt, ...)
 void
 ewarnx(const char *EINFO_RESTRICT fmt, ...)
 {
-	int retval;
 	va_list ap;
 
 	if (fmt && !is_quiet()) {
 		va_start(ap, fmt);
 		elogv(LOG_WARNING, fmt, ap);
-		retval = _ewarnvn(fmt, ap);
+		_ewarnvn(fmt, ap);
 		va_end(ap);
-		retval += fprintf(stderr, "\n");
+		fprintf(stderr, "\n");
 	}
 	exit(EXIT_FAILURE);
 }

src/librc/librc-daemon.c

@@ -15,10 +15,21 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
+#include <errno.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <limits.h>
 #include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "queue.h"
 #include "librc.h"
+#include "helpers.h"
 
 #if defined(__linux__) || (defined (__FreeBSD_kernel__) && defined(__GLIBC__)) \
 	|| defined(__GNU__)

src/librc/librc-depend.c

@@ -16,9 +16,22 @@
  */
 
 #include <sys/utsname.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "queue.h"
 #include "librc.h"
+#include "helpers.h"
+#include "misc.h"
 
 #define GENDEP          RC_LIBEXECDIR "/sh/gendepends.sh"
 

src/librc/librc-misc.c

@@ -16,11 +16,21 @@
  */
 
 #include <fnmatch.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/stat.h>
 
 #include "queue.h"
 #include "librc.h"
 #include "helpers.h"
+#include "misc.h"
 
 bool
 rc_yesno(const char *value)
@@ -117,7 +127,7 @@ rc_getline(char **line, size_t *len, FILE *fp)
 }
 
 char *
-rc_proc_getent(const char *ent _unused)
+rc_proc_getent(const char *ent RC_UNUSED)
 {
 #ifdef __linux__
 	FILE *fp;

src/librc/librc-stringlist.c

@@ -15,8 +15,14 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
+#include <errno.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "queue.h"
 #include "librc.h"
+#include "helpers.h"
 
 RC_STRINGLIST *
 rc_stringlist_new(void)

src/librc/librc.c

@@ -15,9 +15,26 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
+#include <helpers.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <limits.h>
+#include <regex.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include "queue.h"
 #include "librc.h"
-#include <helpers.h>
+#include "misc.h"
+#include "rc.h"
 #ifdef __FreeBSD__
 #  include <sys/sysctl.h>
 #endif
@@ -232,7 +249,7 @@ detect_prefix(const char *systype)
 }
 
 static const char *
-detect_container(const char *systype _unused)
+detect_container(const char *systype RC_UNUSED)
 {
 #ifdef __FreeBSD__
 	if (systype) {
@@ -296,7 +313,7 @@ detect_container(const char *systype _unused)
 }
 
 static const char *
-detect_vm(const char *systype _unused)
+detect_vm(const char *systype RC_UNUSED)
 {
 #ifdef __NetBSD__
 	if (systype) {
@@ -755,8 +772,10 @@ rc_service_mark(const char *service, const RC_SERVICE state)
 					    RC_SVCDIR "/%s/%s",
 					    rc_parse_service_state(RC_SERVICE_WASINACTIVE),
 					    base);
-					if (symlink(init, was) == -1)
+					if (symlink(init, was) == -1) {
+						free(init);
 						return false;
+					}
 					skip_wasinactive = true;
 				}
 				if (unlink(file) == -1) {

src/librc/librc.h

@@ -25,7 +25,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>

src/mark_service/mark_service.c

@@ -10,24 +10,18 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
+#include <sys/types.h>
 
 #include "einfo.h"
 #include "rc.h"
 #include "misc.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 

src/mountinfo/mountinfo.c

@@ -15,15 +15,14 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/param.h>
-
 #if defined(__DragonFly__) || defined(__FreeBSD__)
 #  include <sys/ucred.h>
 #  include <sys/mount.h>
+
 #  define F_FLAGS f_flags
 #elif defined(BSD) && !defined(__GNU__)
 #  include <sys/statvfs.h>
+
 #  define statfs statvfs
 #  define F_FLAGS f_flag
 #elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \
@@ -33,17 +32,19 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <limits.h>
 #include <regex.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
-#include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *procmounts = "/proc/mounts";

src/openrc-init/openrc-init.c

@@ -27,16 +27,16 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/reboot.h>
+#include <sys/types.h>
 #include <sys/wait.h>
+#include <utmp.h>
 
 #ifdef HAVE_SELINUX
 #  include <selinux/selinux.h>
 #endif
 
-#include "helpers.h"
 #include "rc.h"
 #include "plugin.h"
 #include "wtmp.h"

src/openrc-run/openrc-run.c

@@ -15,28 +15,26 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/file.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <getopt.h>
 #include <libgen.h>
-#include <limits.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #if defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) \
 	|| defined(__GNU__)
@@ -54,6 +52,7 @@
 #include "plugin.h"
 #include "selinux.h"
 #include "_usage.h"
+#include "helpers.h"
 
 #define PREFIX_LOCK	RC_SVCDIR "/prefix.lock"
 
@@ -62,7 +61,7 @@
 #define WARN_TIMEOUT	10		/* warn about this every N seconds */
 
 const char *applet = NULL;
-const char *extraopts = "stop | start | restart | describe | zap";
+const char *extraopts = "stop | start | restart | status | describe | zap";
 const char getoptstring[] = "dDsSvl:Z" getoptstring_COMMON;
 const struct option longopts[] = {
 	{ "debug",      0, NULL, 'd'},
@@ -109,7 +108,7 @@ static void
 handle_signal(int sig)
 {
 	int serrno = errno;
-	char *signame = NULL;
+	const char *signame = NULL;
 	struct winsize ws;
 
 	switch (sig) {
@@ -135,20 +134,19 @@ handle_signal(int sig)
 
 	case SIGINT:
 		if (!signame)
-			xasprintf(&signame, "SIGINT");
+			signame = "SIGINT";
 		/* FALLTHROUGH */
 	case SIGTERM:
 		if (!signame)
-			xasprintf(&signame, "SIGTERM");
+			signame = "SIGTERM";
 		/* FALLTHROUGH */
 	case SIGQUIT:
 		if (!signame)
-			xasprintf(&signame, "SIGQUIT");
+			signame = "SIGQUIT";
 		/* Send the signal to our children too */
 		if (service_pid > 0)
 			kill(service_pid, sig);
 		eerror("%s: caught %s, aborting", applet, signame);
-		free(signame);
 		exit(EXIT_FAILURE);
 		/* NOTREACHED */
 
@@ -161,7 +159,7 @@ handle_signal(int sig)
 }
 
 static void
-unhotplug()
+unhotplug(void)
 {
 	char *file = NULL;
 
@@ -645,7 +643,7 @@ svc_start_deps(void)
 	bool first;
 	RC_STRING *svc, *svc2;
 	RC_SERVICE state;
-	int depoptions = RC_DEP_TRACE, n;
+	int depoptions = RC_DEP_TRACE;
 	size_t len;
 	char *p, *tmp;
 	pid_t pid;
@@ -755,7 +753,6 @@ svc_start_deps(void)
 		rc_stringlist_free(use_services);
 		use_services = NULL;
 		len = 0;
-		n = 0;
 		TAILQ_FOREACH(svc, tmplist, entries) {
 			rc_service_schedule_start(svc->value, service);
 			use_services = rc_deptree_depend(deptree,
@@ -765,7 +762,6 @@ svc_start_deps(void)
 			rc_stringlist_free(use_services);
 			use_services = NULL;
 			len += strlen(svc->value) + 2;
-			n++;
 		}
 
 		len += 5;
@@ -788,7 +784,7 @@ svc_start_deps(void)
 	services = NULL;
 }
 
-static void svc_start_real()
+static void svc_start_real(void)
 {
 	bool started;
 	RC_STRING *svc, *svc2;
@@ -1165,7 +1161,6 @@ int main(int argc, char **argv)
 			dir = save;
 		} else
 			file = basename_c(argv[1]);
-		ll = strlen(dir) + strlen(file) + 2;
 		xasprintf(&service, "%s/%s", dir, file);
 		if (stat(service, &stbuf) != 0) {
 			free(service);

src/openrc-shutdown/broadcast.c

@@ -12,24 +12,23 @@
  * This file may not be copied, modified, propagated, or distributed
  *    except according to the terms contained in the LICENSE file.
  */
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <utmp.h>
-#include <utmpx.h>
-#include <pwd.h>
+
+
 #include <fcntl.h>
+#include <paths.h>
+#include <pwd.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
+#include <time.h>
+#include <unistd.h>
+#include <utmpx.h>
 
 #include "broadcast.h"
 #include "helpers.h"
@@ -43,12 +42,7 @@ static sigjmp_buf jbuf;
 /*
  *	Alarm handler
  */
-/*ARGSUSED*/
-# ifdef __GNUC__
-static void handler(int arg __attribute__((unused)))
-# else
-static void handler(int arg)
-# endif
+RC_NORETURN static void handler(int arg RC_UNUSED)
 {
 	siglongjmp(jbuf, 1);
 }

src/openrc-shutdown/openrc-shutdown.c

@@ -19,6 +19,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
+#include <errno.h>
 #include <getopt.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -26,9 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <unistd.h>
 #include <sys/types.h>
-#include <sys/utsname.h>
+#include <strings.h>
+#include <unistd.h>
+#include <time.h>
+#include <utmp.h>
 
 #include "broadcast.h"
 #include "einfo.h"
@@ -167,13 +170,13 @@ static void sleep_no_interrupt(int seconds)
 		duration = remaining;
 }
 
-static void stop_shutdown(int sig)
+RC_NORETURN static void stop_shutdown(int sig)
 {
 	(void) sig;
 	unlink(nologin_file);
 	unlink(shutdown_pid);
-einfo("Shutdown canceled");
-exit(0);
+	einfo("Shutdown cancelled");
+	exit(0);
 }
 
 int main(int argc, char **argv)
@@ -304,7 +307,6 @@ int main(int argc, char **argv)
 	sigaction(SIGINT, &sa, NULL);
 	sigaction(SIGTERM, &sa, NULL);
 	while (shutdown_delay > 0) {
-		need_warning = false;
 		if (shutdown_delay > 180)
 			need_warning = (shutdown_delay % 60 == 0);
 		else if (shutdown_delay > 60)
@@ -313,11 +315,12 @@ int main(int argc, char **argv)
 			need_warning = (shutdown_delay % 15 == 0);
 		else
 			need_warning = true;
+
 		if (shutdown_delay <= 5)
 			create_nologin(shutdown_delay);
 		if (need_warning) {
-		xasprintf(&msg, "\rThe system will %s in %d minutes\r\n",
-		          state, shutdown_delay);
+			xasprintf(&msg, "\rThe system will %s in %d minutes\r\n",
+			          state, shutdown_delay);
 			broadcast(msg);
 			free(msg);
 		}

src/openrc-shutdown/sysvinit.c

@@ -17,11 +17,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
 
 #include "einfo.h"
 #include "sysvinit.h"

src/openrc/rc-logger.c

@@ -16,10 +16,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-
+#include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <poll.h>
@@ -27,6 +24,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
@@ -42,9 +42,9 @@
 
 #include "einfo.h"
 #include "rc-logger.h"
-#include "queue.h"
 #include "rc.h"
 #include "misc.h"
+#include "helpers.h"
 
 #define TMPLOG RC_SVCDIR "/rc.log"
 #define DEFAULTLOG "/var/log/rc.log"

src/openrc/rc-logger.h

@@ -13,6 +13,9 @@
 #ifndef RC_LOGGER_H
 #define RC_LOGGER_H
 
+#include <stdbool.h>
+#include <sys/types.h>
+
 extern pid_t rc_logger_pid;
 extern int rc_logger_tty;
 extern bool rc_in_logger;

src/openrc/rc.c

@@ -20,26 +20,21 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-#include <sys/wait.h>
-
 #include <errno.h>
 #include <dirent.h>
-#include <ctype.h>
 #include <getopt.h>
 #include <libgen.h>
-#include <limits.h>
 #include <pwd.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include <strings.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -49,9 +44,9 @@
 #include "rc-logger.h"
 #include "misc.h"
 #include "plugin.h"
-
 #include "version.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *extraopts = NULL;
 const char getoptstring[] = "a:no:s:S" getoptstring_COMMON;
@@ -382,7 +377,7 @@ static void
 handle_signal(int sig)
 {
 	int serrno = errno;
-	char *signame = NULL;
+	const char *signame = NULL;
 	pid_t pid;
 	RC_PID *pi;
 	int status = 0;
@@ -414,15 +409,15 @@ handle_signal(int sig)
 
 	case SIGINT:
 		if (!signame)
-			xasprintf(&signame, "SIGINT");
+			signame = "SIGINT";
 		/* FALLTHROUGH */
 	case SIGTERM:
 		if (!signame)
-			xasprintf(&signame, "SIGTERM");
+			signame = "SIGTERM";
 		/* FALLTHROUGH */
 	case SIGQUIT:
 		if (!signame)
-			xasprintf(&signame, "SIGQUIT");
+			signame = "SIGQUIT";
 		eerrorx("%s: caught %s, aborting", applet, signame);
 		/* NOTREACHED */
 	case SIGUSR1:
@@ -452,7 +447,7 @@ handle_signal(int sig)
 }
 
 static void
-do_sysinit()
+do_sysinit(void)
 {
 	struct utsname uts;
 	const char *sys;
@@ -505,7 +500,6 @@ runlevel_config(const char *service, const char *level)
 	char *conf, *dir;
 	bool retval;
 
-	dir = dirname(init);
 	dir = dirname(init);
 	xasprintf(&conf, "%s/conf.d/%s.%s", dir, service, level);
 	retval = exists(conf);
@@ -696,7 +690,7 @@ do_start_services(const RC_STRINGLIST *start_services, bool parallel)
 }
 
 #ifdef RC_DEBUG
-static void
+RC_NORETURN static void
 handle_bad_signal(int sig)
 {
 	char pid[10];

src/rc-abort/rc-abort.c

@@ -10,20 +10,11 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "einfo.h"
 

src/rc-depend/rc-depend.c

@@ -15,27 +15,20 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
 #include <errno.h>
-#include <fcntl.h>
 #include <getopt.h>
-#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
-#include <utime.h>
 
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
 #include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;

src/rc-service/rc-service.c

@@ -15,7 +15,9 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
+#include <errno.h>
 #include <getopt.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,8 +26,8 @@
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
-#include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;

src/rc-status/rc-status.c

@@ -16,17 +16,21 @@
  */
 
 #include <getopt.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <errno.h>
+#include <time.h>
 
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
 #include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 enum format_t {
 	FORMAT_DEFAULT,
@@ -61,8 +65,8 @@ const char * const longopts_help[] = {
 	longopts_help_COMMON
 };
 const char *usagestring = ""						\
-	"Usage: rc-status [options] -f ini <runlevel>...\n"		\
-	"   or: rc-status [options] [-a | -c | -l | -m | -r | -s | -u]";
+	"Usage: rc-status [options] [-f ini] <runlevel>...\n"		\
+	"   or: rc-status [options] [-f ini] [-a | -c | -l | -m | -r | -s | -u]";
 
 static RC_DEPTREE *deptree;
 static RC_STRINGLIST *types;
@@ -293,6 +297,7 @@ int main(int argc, char **argv)
 			TAILQ_FOREACH(l, levels, entries)
 				printf("%s\n", l->value);
 			goto exit;
+			/* NOTREACHED */
 		case 'm':
 			services = rc_services_in_runlevel(NULL);
 			levels = rc_runlevel_list();
@@ -312,8 +317,9 @@ int main(int argc, char **argv)
 					free(s->value);
 					free(s);
 				}
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services, format);
 			goto exit;
+			/* NOTREACHED */
 		case 'r':
 			runlevel = rc_runlevel_get();
 			printf("%s\n", runlevel);
@@ -324,12 +330,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, format);
 			goto exit;
 			/* NOTREACHED */
 		case 's':
 			services = rc_services_in_runlevel(NULL);
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services, format);
 			goto exit;
 			/* NOTREACHED */
 		case 'u':
@@ -344,7 +350,7 @@ int main(int argc, char **argv)
 						break;
 					}
 			}
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services, format);
 			goto exit;
 			/* NOTREACHED */
 
@@ -444,6 +450,7 @@ int main(int argc, char **argv)
 		 * be added to the list
 		 */
 		unsetenv("RC_SVCNAME");
+
 		print_level("Dynamic", "needed/wanted", format);
 		print_services(NULL, nservices, format);
 		print_level("Dynamic", "manual", format);

src/rc-update/rc-update.c

@@ -17,7 +17,6 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +28,7 @@
 #include "rc.h"
 #include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;

src/seedrng/seedrng.c

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2022 The OpenRC Authors.
+ * Copyright (c) 2022-2023 The OpenRC Authors.
  * See the Authors file at the top-level directory of this distribution and
  * https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
  *
@@ -30,12 +30,12 @@
 #include <errno.h>
 #include <endian.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "rc.h"
 #include "einfo.h"
 #include "helpers.h"
 #include "_usage.h"
@@ -455,7 +455,7 @@ int main(int argc, char **argv)
 	static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix";
 	static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure";
 	int opt, fd, dfd, program_ret = 0;
-	char *seed_dir = NULL;
+	const char *seed_dir = NULL;
 	uint8_t new_seed[MAX_SEED_LEN];
 	size_t new_seed_len;
 	bool new_seed_creditable;
@@ -470,7 +470,7 @@ int main(int argc, char **argv)
 		switch (opt) {
 		case LONGOPT_SEED_DIR:
 			if (!seed_dir)
-				seed_dir = xstrdup(optarg);
+				seed_dir = optarg;
 			break;
 		case LONGOPT_SKIP_CREDIT:
 			skip_credit = true;
@@ -479,7 +479,7 @@ int main(int argc, char **argv)
 		}
 	}
 	if (!seed_dir)
-		seed_dir = xstrdup(DEFAULT_SEED_DIR);
+		seed_dir = DEFAULT_SEED_DIR;
 	if (getuid())
 		eerrorx("%s: superuser access is required", applet);
 	umask(0077);

src/service/service.c

@@ -10,24 +10,16 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "einfo.h"
 #include "rc.h"
 #include "misc.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 

src/shared/_usage.c

@@ -13,19 +13,13 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "rc.h"
-#include "misc.h"
 #include "_usage.h"
 #include "version.h"
+#include "helpers.h"
 
-#if lint
-#  define _noreturn
-#endif
-#if __GNUC__ > 2 || defined(__INTEL_COMPILER)
-#  define _noreturn __attribute__ ((__noreturn__))
-#else
-#  define _noreturn
-#endif
 
 void set_quiet_options(void)
 {
@@ -42,7 +36,7 @@ void set_quiet_options(void)
 	}
 }
 
-_noreturn void show_version(void)
+RC_NORETURN void show_version(void)
 {
 	const char *systype = NULL;
 
@@ -57,7 +51,7 @@ _noreturn void show_version(void)
 	exit(EXIT_SUCCESS);
 }
 
-_noreturn void usage(int exit_status)
+RC_NORETURN void usage(int exit_status)
 {
 	const char * const has_arg[] = { "", "<arg>", "[arg]" };
 	int i;

src/shared/_usage.h

@@ -11,6 +11,7 @@
  */
 
 #include <getopt.h>
+#include <stdlib.h>
 
 #define getoptstring_COMMON "ChqVv"
 

src/shared/helpers.h

@@ -18,22 +18,22 @@
 #ifndef __HELPERS_H__
 #define __HELPERS_H__
 
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
 #define ERRX fprintf (stderr, "out of memory\n"); exit (1)
 
-#define UNCONST(a)		((void *)(unsigned long)(const void *)(a))
+#define UNCONST(a)		((void *)(uintptr_t)(const void *)(a))
 
-#ifdef lint
-# define _unused
-#endif
-#if __GNUC__ > 2 || defined(__INTEL_COMPILER)
-# define _dead __attribute__((__noreturn__))
-# define _unused __attribute__((__unused__))
-# define _xasprintf(a, b)  __attribute__((__format__(__printf__, a, b)))
-#else
-# define _dead
-# define _unused
-# define _xasprintf(a, b)
-#endif
+#define RC_UNUSED __attribute__((__unused__))
+#define RC_NORETURN __attribute__((__noreturn__))
+#define RC_PRINTF(a, b)  __attribute__((__format__(__printf__, a, b)))
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
@@ -55,11 +55,7 @@
 	} while (/* CONSTCOND */ 0)
 #endif
 
-#include <stdarg.h>
-#include <stdbool.h>
-#include <sys/stat.h>
-
-_unused static void *xmalloc (size_t size)
+RC_UNUSED static void *xmalloc (size_t size)
 {
 	void *value = malloc(size);
 
@@ -70,7 +66,7 @@ _unused static void *xmalloc (size_t size)
 	/* NOTREACHED */
 }
 
-_unused static void *xrealloc(void *ptr, size_t size)
+RC_UNUSED static void *xrealloc(void *ptr, size_t size)
 {
 	void *value = realloc(ptr, size);
 
@@ -81,7 +77,7 @@ _unused static void *xrealloc(void *ptr, size_t size)
 	/* NOTREACHED */
 }
 
-_unused static char *xstrdup(const char *str)
+RC_UNUSED static char *xstrdup(const char *str)
 {
 	char *value;
 
@@ -103,7 +99,7 @@ _unused static char *xstrdup(const char *str)
  * basename_c never modifies the argument. As such, if there is a trailing
  * slash then an empty string is returned.
  */
-_unused static const char *basename_c(const char *path)
+RC_UNUSED static const char *basename_c(const char *path)
 {
 	const char *slash = strrchr(path, '/');
 
@@ -112,14 +108,14 @@ _unused static const char *basename_c(const char *path)
 	return (path);
 }
 
-_unused static bool exists(const char *pathname)
+RC_UNUSED static bool exists(const char *pathname)
 {
 	struct stat buf;
 
 	return (stat(pathname, &buf) == 0);
 }
 
-_unused static bool existss(const char *pathname)
+RC_UNUSED static bool existss(const char *pathname)
 {
 	struct stat buf;
 
@@ -129,12 +125,12 @@ _unused static bool existss(const char *pathname)
 /*
  * This is an OpenRC specific version of the asprintf() function.
  * We do this to avoid defining the _GNU_SOURCE feature test macro on
- * glibc systems and to insure that we have a consistent function across
+ * glibc systems and to ensure that we have a consistent function across
  * platforms. This also allows us to call our xmalloc and xrealloc
  * functions to handle memory allocation.
  * this function was originally written by Mike Frysinger.
  */
-_unused _xasprintf(2,3) static int xasprintf(char **strp, const char *fmt, ...)
+RC_UNUSED RC_PRINTF(2,3) static int xasprintf(char **strp, const char *fmt, ...)
 {
 	va_list ap;
 	int len;

src/shared/misc.c

@@ -15,22 +15,21 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-
-#ifdef __linux__
-#  include <sys/sysinfo.h>
-#endif
-
-#include <sys/time.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#ifdef __linux__
+#  include <sys/sysinfo.h>
+#endif
+#include <sys/types.h>
+#include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
@@ -40,6 +39,7 @@
 #include "rc.h"
 #include "misc.h"
 #include "version.h"
+#include "helpers.h"
 
 extern char **environ;
 

src/shared/misc.h

@@ -19,6 +19,7 @@
 #define __RC_MISC_H__
 
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -27,6 +28,7 @@
 #include <unistd.h>
 
 #include "helpers.h"
+#include "rc.h"
 
 #define RC_LEVEL_BOOT           "boot"
 #define RC_LEVEL_DEFAULT        "default"

src/shared/plugin.c

@@ -17,12 +17,10 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
-
 #include <dirent.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,8 +30,8 @@
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
-#include "misc.h"
 #include "plugin.h"
+#include "helpers.h"
 
 #define RC_PLUGIN_HOOK "rc_plugin_hook"
 

src/shared/plugin.h

@@ -18,6 +18,11 @@
 #ifndef __LIBRC_PLUGIN_H__
 #define __LIBRC_PLUGIN_H__
 
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "rc.h"
+
 /* A simple flag to say if we're in a plugin process or not.
  * Mainly used in atexit code. */
 extern bool rc_in_plugin;

src/shared/schedules.c

@@ -30,16 +30,11 @@
 #include <string.h>
 #include <syslog.h>
 #include <time.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
-#include "misc.h"
 #include "schedules.h"
 #include "helpers.h"
 

src/shared/schedules.h

@@ -13,6 +13,9 @@
 #ifndef __RC_SCHEDULES_H
 #define __RC_SCHEDULES_H
 
+#include <stdbool.h>
+#include <sys/types.h>
+
 void free_schedulelist(void);
 int parse_signal(const char *applet, const char *sig);
 void parse_schedule(const char *applet, const char *string, int timeout);

src/shared/wtmp.c

@@ -15,14 +15,12 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
+#include <utmp.h>
 
 #include "wtmp.h"
 

src/shared/wtmp.h

@@ -19,6 +19,7 @@
 #define __RC_WTMP_H__
 
 #include <utmp.h>
+#include <sys/types.h>
 
 void log_wtmp(const char *user, const char *id, pid_t pid, int type,
 		const char *line);

src/shell_var/shell_var.c

@@ -10,14 +10,9 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#include <errno.h>
 #include <ctype.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 int main(int argc, char **argv)
 {

src/start-stop-daemon/pipes.c

@@ -16,8 +16,8 @@
  */
 
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include "pipes.h"
 

src/start-stop-daemon/start-stop-daemon.c

@@ -26,47 +26,44 @@
 # define _GNU_SOURCE
 #endif
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#ifdef __linux__
-#include <sys/syscall.h> /* For io priority */
-#include <sys/prctl.h> /* For prctl */
-#endif
-
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <limits.h>
 #include <grp.h>
 #include <pwd.h>
+#include <sched.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifdef __linux__
+# include <sys/syscall.h> /* For io priority */
+# include <sys/prctl.h> /* For prctl */
+#endif
+#include <termios.h>
 #include <time.h>
 #include <unistd.h>
 
 #ifdef HAVE_PAM
-#include <security/pam_appl.h>
+# include <security/pam_appl.h>
 
 /* We are not supporting authentication conversations */
 static struct pam_conv conv = { NULL, NULL};
 #endif
 
 #ifdef HAVE_CAP
-#include <sys/capability.h>
+# include <sys/capability.h>
 #endif
 
-#include <sched.h>
-
 #include "einfo.h"
 #include "queue.h"
 #include "rc.h"
@@ -182,9 +179,9 @@ extern char **environ;
 # define SYS_ioprio_set __NR_ioprio_set
 #endif
 #if !defined(__DragonFly__)
-static inline int ioprio_set(int which _unused,
-			     int who _unused,
-			     int ioprio _unused)
+static inline int ioprio_set(int which RC_UNUSED,
+			     int who RC_UNUSED,
+			     int ioprio RC_UNUSED)
 {
 #ifdef SYS_ioprio_set
 	return syscall(SYS_ioprio_set, which, who, ioprio);
@@ -207,20 +204,20 @@ handle_signal(int sig)
 {
 	int status;
 	int serrno = errno;
-	char *signame = NULL;
+	const char *signame = NULL;
 
 	switch (sig) {
 	case SIGINT:
 		if (!signame)
-			xasprintf(&signame, "SIGINT");
+			signame = "SIGINT";
 		/* FALLTHROUGH */
 	case SIGTERM:
 		if (!signame)
-			xasprintf(&signame, "SIGTERM");
+			signame = "SIGTERM";
 		/* FALLTHROUGH */
 	case SIGQUIT:
 		if (!signame)
-			xasprintf(&signame, "SIGQUIT");
+			signame = "SIGQUIT";
 		eerrorx("%s: caught %s, aborting", applet, signame);
 		/* NOTREACHED */
 
@@ -239,9 +236,6 @@ handle_signal(int sig)
 		eerror("%s: caught unknown signal %d", applet, sig);
 	}
 
-	/* free signame */
-	free(signame);
-
 	/* Restore errno */
 	errno = serrno;
 }
@@ -1104,9 +1098,12 @@ int main(int argc, char **argv)
 				|| rc_yesno(getenv("EINFO_QUIET")))
 			dup2(stderr_fd, STDERR_FILENO);
 
+#ifdef HAVE_CLOSEFROM
+		closefrom(3);
+#else
 		for (i = getdtablesize() - 1; i >= 3; --i)
-			if (i != pipefd[1])
-				close(i);
+			close(i);
+#endif
 
 		if (scheduler != NULL) {
 			int scheduler_index;

src/supervise-daemon/supervise-daemon.c

@@ -22,20 +22,11 @@
 #define ONE_SECOND    1000000000
 #define ONE_MS           1000000
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#ifdef __linux__
-#include <sys/syscall.h> /* For io priority */
-#include <sys/prctl.h> /* For prctl */
+#ifdef HAVE_CLOSE_RANGE_CLOEXEC
+/* For close_range() */
+# define _GNU_SOURCE
 #endif
 
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -47,7 +38,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
+#include <strings.h>
+#ifdef __linux__
+# include <sys/syscall.h> /* For io priority */
+# include <sys/prctl.h> /* For prctl */
+#endif
 #include <syslog.h>
+#include <sys/ioctl.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -191,8 +192,8 @@ extern char **environ;
 # define SYS_ioprio_set __NR_ioprio_set
 #endif
 #if !defined(__DragonFly__)
-static inline int ioprio_set(int which _unused, int who _unused,
-			     int ioprio _unused)
+static inline int ioprio_set(int which RC_UNUSED, int who RC_UNUSED,
+			     int ioprio RC_UNUSED)
 {
 #ifdef SYS_ioprio_set
 	return syscall(SYS_ioprio_set, which, who, ioprio);
@@ -207,7 +208,7 @@ static void cleanup(void)
 	free(changeuser);
 }
 
-static void re_exec_supervisor(void)
+RC_NORETURN static void re_exec_supervisor(void)
 {
 	syslog(LOG_WARNING, "Re-executing for %s", svcname);
 	execlp("supervise-daemon", "supervise-daemon", svcname, "--reexec",
@@ -353,7 +354,7 @@ static pid_t exec_command(const char *cmd)
 	return pid;
 }
 
-static void child_process(char *exec, char **argv)
+RC_NORETURN static void child_process(char *exec, char **argv)
 {
 	RC_STRINGLIST *env_list;
 	RC_STRING *env;
@@ -569,8 +570,11 @@ static void child_process(char *exec, char **argv)
 	if (redirect_stderr || rc_yesno(getenv("EINFO_QUIET")))
 		dup2(stderr_fd, STDERR_FILENO);
 
-	for (i = getdtablesize() - 1; i >= 3; --i)
-		fcntl(i, F_SETFD, FD_CLOEXEC);
+#ifdef HAVE_CLOSE_RANGE_CLOEXEC
+	if (close_range(3, UINT_MAX, CLOSE_RANGE_CLOEXEC) < 0)
+#endif
+		for (i = getdtablesize() - 1; i >= 3; --i)
+			fcntl(i, F_SETFD, FD_CLOEXEC);
 	cmdline = make_cmdline(argv);
 	syslog(LOG_INFO, "Child command line: %s", cmdline);
 	free(cmdline);
@@ -583,7 +587,7 @@ static void child_process(char *exec, char **argv)
 	eerrorx("%s: failed to exec `%s': %s", applet, exec,strerror(errno));
 }
 
-static void supervisor(char *exec, char **argv)
+RC_NORETURN static void supervisor(char *exec, char **argv)
 {
 	FILE *fp;
 	char buf[2048];

src/swclock/swclock.c

@@ -19,20 +19,17 @@
  */
 
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <utime.h>
+#include <string.h>
 
 #include "einfo.h"
-#include "rc.h"
-#include "misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 
 const char *applet = NULL;
@@ -78,14 +75,12 @@ int main(int argc, char **argv)
 		eerrorx("swclock: Reference file was not specified");
 
 	if (sflag) {
-		if (stat(file, &sb) == -1) {
-			opt = open(file, O_WRONLY | O_CREAT, 0644);
-			if (opt == -1)
-				eerrorx("swclock: open: %s", strerror(errno));
-			close(opt);
-		} else
-			if (utime(file, NULL) == -1)
-				eerrorx("swclock: utime: %s", strerror(errno));
+		int fd = open(file, O_WRONLY | O_CREAT, 0644);
+		if (fd == -1)
+			eerrorx("swclock: open: %s", strerror(errno));
+		if (futimens(fd, NULL) == -1)
+			eerrorx("swclock: futimens: %s", strerror(errno));
+		close(fd);
 		return 0;
 	}
 

src/value/value.c

@@ -12,24 +12,14 @@
 
 #define SYSLOG_NAMES
 
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "einfo.h"
 #include "rc.h"
-#include "misc.h"
+#include "helpers.h"
 
 const char *applet = NULL;