Merge branch 'master' into master

NEWS.md

@@ -4,6 +4,13 @@ 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.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.

meson.build

@@ -1,5 +1,5 @@
 project('OpenRC', 'c',
-  version : '0.48',
+  version : '0.49',
   license: 'BSD-2',
   default_options : [
     'c_std=c99',
@@ -203,6 +203,10 @@ if cc.has_function('close_range', prefix: '#define _GNU_SOURCE\n#include <unistd
   add_project_arguments('-DHAVE_CLOSE_RANGE_CLOEXEC', language: 'c')
 endif
 
+if cc.has_function('strlcpy', prefix: '#define _GNU_SOURCE\n#include <string.h>')
+  add_project_arguments('-DHAVE_STRLCPY', language: 'c')
+endif
+
 incdir = include_directories('src/shared')
 einfo_incdir = include_directories('src/libeinfo')
 rc_incdir = include_directories('src/librc')

src/libeinfo/libeinfo.c

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

src/shared/helpers.h

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

tools/meson_final.sh

@@ -11,7 +11,6 @@ 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