NEWS.md

@@ -4,18 +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.50
-
-This is a bug fix release which fixes a significant performance issue on
-musl libc systems.
-
-## OpenRC 0.49
-
-This release adds support for glibc's builtin 
-strlcpy, strlcat etc functions, which will be in posix next.
-Also, it fixes completions.
-
-
 ## OpenRC 0.48
 
 This release is a maintenance release; it has no user-facing changes.

bash-completion/rc-service

@@ -92,11 +92,13 @@ _rc_service()
 			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
+			shopt -s extglob
 			while read -r _ line; do
 				if [[ $line == +([[:alnum:]_]):* ]]; then
 					opts+="${line%%:*} "
 				fi
 			done < <(rc-service "$prev" describe 2>&1)
+			shopt -u extglob
 			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 			return 0
 		fi

meson.build

@@ -1,5 +1,5 @@
 project('OpenRC', 'c',
-  version : '0.50',
+  version : '0.48',
   license: 'BSD-2',
   default_options : [
     'c_std=c99',
@@ -195,14 +195,12 @@ 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('close_range', prefix: '#define _GNU_SOURCE\n#include <unistd.h>')
-  add_project_arguments('-DHAVE_CLOSE_RANGE', language: 'c')
-elif cc.has_header('linux/close_range.h')
-  add_project_arguments('-DHAVE_LINUX_CLOSE_RANGE_H', language: 'c')
+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('strlcpy', prefix: '#define _GNU_SOURCE\n#include <string.h>')
-  add_project_arguments('-DHAVE_STRLCPY', language: 'c')
+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')

src/libeinfo/libeinfo.c

@@ -146,7 +146,9 @@ static const char *const color_terms[] = {
 };
 #endif
 
-#ifndef HAVE_STRLCPY
+/* strlcat and strlcpy are nice, shame glibc does not define them */
+#ifdef __GLIBC__
+#  if !defined (__UCLIBC__) && !defined (__dietlibc__)
 static size_t
 strlcat(char *dst, const char *src, size_t size)
 {
@@ -174,6 +176,7 @@ strlcat(char *dst, const char *src, size_t size)
 
 	return dst_n + (s - src);
 }
+#  endif
 #endif
 
 static bool

src/openrc/rc.c

@@ -527,7 +527,7 @@ runlevel_config(const char *service, const char *level)
 	char *conf, *dir;
 	bool retval;
 
-	dir = dirname(dirname(init));
+	dir = dirname(init);
 	xasprintf(&conf, "%s/conf.d/%s.%s", dir, service, level);
 	retval = exists(conf);
 	free(conf);

src/shared/helpers.h

@@ -37,8 +37,10 @@
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
-#ifndef HAVE_STRLCPY
+#ifdef __GLIBC__
+#  if !defined (__UCLIBC__) && !defined (__dietlibc__)
 #    define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
+#  endif
 #endif
 
 #ifndef timespecsub

src/shared/misc.c

@@ -15,18 +15,10 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#ifdef HAVE_CLOSE_RANGE
-/* For close_range() */
-# define _GNU_SOURCE
-#endif
-
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#ifdef HAVE_LINUX_CLOSE_RANGE_H
-#  include <linux/close_range.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -34,7 +26,6 @@
 #include <sys/file.h>
 #include <sys/time.h>
 #ifdef __linux__
-#  include <sys/syscall.h> /* for close_range */
 #  include <sys/sysinfo.h>
 #endif
 #include <sys/types.h>
@@ -509,30 +500,3 @@ pid_t get_pid(const char *applet,const char *pidfile)
 
 	return pid;
 }
-
-#ifndef HAVE_CLOSE_RANGE
-static inline int close_range(int first RC_UNUSED,
-			      int last RC_UNUSED,
-			      unsigned int flags RC_UNUSED)
-{
-#ifdef SYS_close_range
-	return syscall(SYS_close_range, first, last, flags);
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-#endif
-#ifndef CLOSE_RANGE_CLOEXEC
-# define CLOSE_RANGE_CLOEXEC	(1U << 2)
-#endif
-
-void
-cloexec_fds_from(int first)
-{
-	int i;
-	if (close_range(first, UINT_MAX, CLOSE_RANGE_CLOEXEC) < 0) {
-		for (i = getdtablesize() - 1; i >= first; --i)
-			fcntl(i, F_SETFD, FD_CLOEXEC);
-	}
-}

src/shared/misc.h

@@ -73,6 +73,4 @@ void from_time_t(char *time_string, time_t tv);
 time_t to_time_t(char *timestring);
 pid_t get_pid(const char *applet, const char *pidfile);
 
-void cloexec_fds_from(int);
-
 #endif

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

@@ -1098,7 +1098,12 @@ int main(int argc, char **argv)
 				|| rc_yesno(getenv("EINFO_QUIET")))
 			dup2(stderr_fd, STDERR_FILENO);
 
-		cloexec_fds_from(3);
+#ifdef HAVE_CLOSEFROM
+		closefrom(3);
+#else
+		for (i = getdtablesize() - 1; i >= 3; --i)
+			close(i);
+#endif
 
 		if (scheduler != NULL) {
 			int scheduler_index;

src/supervise-daemon/supervise-daemon.c

@@ -22,6 +22,11 @@
 #define ONE_SECOND    1000000000
 #define ONE_MS           1000000
 
+#ifdef HAVE_CLOSE_RANGE_CLOEXEC
+/* For close_range() */
+# define _GNU_SOURCE
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -565,8 +570,11 @@ RC_NORETURN static void child_process(char *exec, char **argv)
 	if (redirect_stderr || rc_yesno(getenv("EINFO_QUIET")))
 		dup2(stderr_fd, STDERR_FILENO);
 
-	cloexec_fds_from(3);
-
+#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);

tools/meson_final.sh

@@ -11,6 +11,7 @@ sysvinit="$4"
 if [ "${os}" != Linux ]; then
 	install -d "${DESTDIR}/${rc_libexecdir}"/init.d
 fi
+install -d "${DESTDIR}/${rc_libexecdir}"/tmp
 install -m 644 "${MESON_BUILD_ROOT}/src/shared/version" "${DESTDIR}/${rc_libexecdir}"
 if [ "${os}" = Linux ] && [ "${sysvinit}" = yes ]; then
 	ln -s openrc-init "${DESTDIR}/${sbindir}"/init