diff options
40 files changed, 50 insertions, 26 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2015-2018 Laurent Bercot <ska-skaware@skarnet.org> +Copyright (c) 2015-2019 Laurent Bercot <ska-skaware@skarnet.org> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -6,9 +6,9 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.7.0.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.8.0.0 or later: http://skarnet.org/software/skalibs/ - execline version 2.5.0.1 or later: http://skarnet.org/software/execline/ - - s6 version 2.7.2.0 or later: http://skarnet.org/software/s6/ + - s6 version 2.8.0.0 or later: http://skarnet.org/software/s6/ This software will run on any operating system that implements POSIX.1-2008, available at: @@ -3,6 +3,7 @@ Changelog for s6-rc. In 0.4.1.1 ---------- + - Adaptation to skalibs-2.8.0.0 and s6-2.8.0.0 - Bugfixes. diff --git a/doc/index.html b/doc/index.html index 7db74a2..625121f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -48,11 +48,11 @@ scripts are also run in a controlled environment. <li> A POSIX-compliant system with a standard C development environment </li> <li> GNU make, version 3.81 or later </li> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version -2.7.0.0 or later </li> +2.8.0.0 or later </li> <li> <a href="//skarnet.org/software/execline/">execline</a> version -2.5.0.1 or later </li> +2.5.0.2 or later </li> <li> <a href="//skarnet.org/software/s6/">s6</a> version -2.7.2.0 or later </li> +2.8.0.0 or later </li> </ul> <h3> Licensing </h3> diff --git a/doc/upgrade.html b/doc/upgrade.html index da9e976..d186ffc 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -33,7 +33,12 @@ minor and bugfix version changes. <h2> in 0.4.1.1 </h2> <ul> - <li> No functional changes. </li> + <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> +dependency bumped to 2.8.0.0. </li> + <li> <a href="//skarnet.org/software/execline/">execline</a> +dependency bumped to 2.5.0.2. </li> + <li> <a href="//skarnet.org/software/s6/">s6</a> +dependency bumped to 2.8.0.0. </li> </ul> <h2> in 0.4.1.0 </h2> diff --git a/examples/source/dns-cache-log/notification-fd b/examples/source/dns-cache-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/dns-cache-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/dns-cache-log/run b/examples/source/dns-cache-log/run index 4177eaa..6bd00d2 100755 --- a/examples/source/dns-cache-log/run +++ b/examples/source/dns-cache-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid dnslog exec -c -s6-log t s1000000 n20 /var/log/dns-cache +s6-log -d3 -- t s1000000 n20 /var/log/dns-cache diff --git a/examples/source/dns-server-tcp-4-log/notification-fd b/examples/source/dns-server-tcp-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/dns-server-tcp-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/dns-server-tcp-4-log/run b/examples/source/dns-server-tcp-4-log/run index 1dd5335..290bc39 100755 --- a/examples/source/dns-server-tcp-4-log/run +++ b/examples/source/dns-server-tcp-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid dnslog exec -c -s6-log t s1000000 n20 /var/log/dns-server-tcp-4 +s6-log -d3 -- t s1000000 n20 /var/log/dns-server-tcp-4 diff --git a/examples/source/dns-server-udp-log/notification-fd b/examples/source/dns-server-udp-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/dns-server-udp-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/dns-server-udp-log/run b/examples/source/dns-server-udp-log/run index 0782e5a..e472953 100755 --- a/examples/source/dns-server-udp-log/run +++ b/examples/source/dns-server-udp-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid dnslog exec -c -s6-log t s1000000 n20 /var/log/dns-server-udp +s6-log -d3 -- t s1000000 n20 /var/log/dns-server-udp diff --git a/examples/source/fdholder-log/notification-fd b/examples/source/fdholder-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/fdholder-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/fdholder-log/run b/examples/source/fdholder-log/run index 6cde268..b31d28c 100755 --- a/examples/source/fdholder-log/run +++ b/examples/source/fdholder-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid fdhlog exec -c -s6-log s1000000 n20 t /var/log/fdholder +s6-log -d3 -- s1000000 n20 t /var/log/fdholder diff --git a/examples/source/hostapd-log/notification-fd b/examples/source/hostapd-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/hostapd-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/hostapd-log/run b/examples/source/hostapd-log/run index 6a4554f..5dc102e 100755 --- a/examples/source/hostapd-log/run +++ b/examples/source/hostapd-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid wifilog exec -c -s6-log s1000000 n20 t /var/log/hostapd +s6-log -d3 -- s1000000 n20 t /var/log/hostapd diff --git a/examples/source/httpd-4-log/notification-fd b/examples/source/httpd-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/httpd-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/httpd-4-log/run b/examples/source/httpd-4-log/run index 549034f..5ee680e 100755 --- a/examples/source/httpd-4-log/run +++ b/examples/source/httpd-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid publilog exec -c -s6-log t s1000000 n20 /var/log/httpd-4 +s6-log -d3 -- t s1000000 n20 /var/log/httpd-4 diff --git a/examples/source/identd-4-log/notification-fd b/examples/source/identd-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/identd-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/identd-4-log/run b/examples/source/identd-4-log/run index 042e07c..176dc99 100755 --- a/examples/source/identd-4-log/run +++ b/examples/source/identd-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid identlog exec -c -s6-log t s1000000 n20 /var/log/identd-4 +s6-log -d3 -- t s1000000 n20 /var/log/identd-4 diff --git a/examples/source/klogd-log/notification-fd b/examples/source/klogd-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/klogd-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/klogd-log/run b/examples/source/klogd-log/run index d9659e7..d57e688 100755 --- a/examples/source/klogd-log/run +++ b/examples/source/klogd-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid klog exec -c -s6-log t s1000000 n20 /var/log/klogd +s6-log -d3 -- t s1000000 n20 /var/log/klogd diff --git a/examples/source/ntpclient-log/notification-fd b/examples/source/ntpclient-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/ntpclient-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/ntpclient-log/run b/examples/source/ntpclient-log/run index 80d7b5b..be212c9 100755 --- a/examples/source/ntpclient-log/run +++ b/examples/source/ntpclient-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid ntplog exec -c -s6-log t /var/log/ntpclient +s6-log -d3 -- t /var/log/ntpclient diff --git a/examples/source/qmail-log/notification-fd b/examples/source/qmail-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/qmail-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/qmail-log/run b/examples/source/qmail-log/run index 60f9a67..f9fa765 100755 --- a/examples/source/qmail-log/run +++ b/examples/source/qmail-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid qmaillog exec -c -s6-log t s16777216 n64 /var/log/qmail +s6-log -d3 -- t s16777216 n64 /var/log/qmail diff --git a/examples/source/qmtpd-4-log/notification-fd b/examples/source/qmtpd-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/qmtpd-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/qmtpd-4-log/run b/examples/source/qmtpd-4-log/run index 1efb769..0a2e9e3 100755 --- a/examples/source/qmtpd-4-log/run +++ b/examples/source/qmtpd-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid qmaillog exec -c -s6-log t s1000000 n20 /var/log/qmtpd-4 +s6-log -d3 -- t s1000000 n20 /var/log/qmtpd-4 diff --git a/examples/source/smtpd-4-log/notification-fd b/examples/source/smtpd-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/smtpd-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/smtpd-4-log/run b/examples/source/smtpd-4-log/run index 43f665b..74eefb3 100755 --- a/examples/source/smtpd-4-log/run +++ b/examples/source/smtpd-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid qmaillog exec -c -s6-log t s1000000 n20 /var/log/smtpd-4 +s6-log -d3 -- t s1000000 n20 /var/log/smtpd-4 diff --git a/examples/source/sshd-4-log/notification-fd b/examples/source/sshd-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/sshd-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/sshd-4-log/run b/examples/source/sshd-4-log/run index 25f7773..8176595 100755 --- a/examples/source/sshd-4-log/run +++ b/examples/source/sshd-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid log exec -c -s6-log t s1000000 n20 /var/log/sshd-4 +s6-log -d3 -- t s1000000 n20 /var/log/sshd-4 diff --git a/examples/source/syslogd-log/notification-fd b/examples/source/syslogd-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/syslogd-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/syslogd-log/run b/examples/source/syslogd-log/run index 2f62604..9f456cb 100755 --- a/examples/source/syslogd-log/run +++ b/examples/source/syslogd-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid syslog exec -c -s6-log t s1000000 n20 /var/log/syslogd +s6-log -d3 -- t s1000000 n20 /var/log/syslogd diff --git a/examples/source/taiclockd-4-log/notification-fd b/examples/source/taiclockd-4-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/taiclockd-4-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/taiclockd-4-log/run b/examples/source/taiclockd-4-log/run index abb295c..0d5d683 100755 --- a/examples/source/taiclockd-4-log/run +++ b/examples/source/taiclockd-4-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid tailog exec -c -s6-log t s1000000 n20 /var/log/taiclockd-4 +s6-log -d3 -- t s1000000 n20 /var/log/taiclockd-4 diff --git a/examples/source/udhcpc-eth3-log/notification-fd b/examples/source/udhcpc-eth3-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/udhcpc-eth3-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/udhcpc-eth3-log/run b/examples/source/udhcpc-eth3-log/run index d09823d..c3b3350 100755 --- a/examples/source/udhcpc-eth3-log/run +++ b/examples/source/udhcpc-eth3-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid log exec -c -s6-log t s1000000 n20 /var/log/udhcpc-eth3 +s6-log -d3 -- t s1000000 n20 /var/log/udhcpc-eth3 diff --git a/examples/source/udhcpd-wlan0-log/notification-fd b/examples/source/udhcpd-wlan0-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/examples/source/udhcpd-wlan0-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/examples/source/udhcpd-wlan0-log/run b/examples/source/udhcpd-wlan0-log/run index 5142145..7a72920 100755 --- a/examples/source/udhcpd-wlan0-log/run +++ b/examples/source/udhcpd-wlan0-log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid wifilog exec -c -s6-log t s1000000 n20 /var/log/udhcpd-wlan0 +s6-log -d3 -- t s1000000 n20 /var/log/udhcpd-wlan0 diff --git a/src/libs6rc/s6rc_db_read.c b/src/libs6rc/s6rc_db_read.c index 717382f..08323c7 100644 --- a/src/libs6rc/s6rc_db_read.c +++ b/src/libs6rc/s6rc_db_read.c @@ -2,7 +2,8 @@ #include <string.h> #include <stdint.h> -#include <skalibs/bytestr.h> + +#include <skalibs/posixplz.h> #include <skalibs/buffer.h> #include <skalibs/env.h> #include <skalibs/djbunix.h> @@ -19,7 +20,7 @@ static int s6rc_db_check_valid_string (char const *string, size_t stringlen, size_t pos) { if (pos >= stringlen) return 0 ; - if (str_nlen(string + pos, stringlen - pos) == stringlen - pos) return 0 ; + if (strnlen(string + pos, stringlen - pos) == stringlen - pos) return 0 ; return 1 ; } |