upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-12 18:20:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: fix clang-tidy warnings

Browse source 
Fixed narrowing conversions:
- strtol replaced with strtonum with range check
- read returns ssize_t
- kevent.data explicitly cast to int before passing into strerror

While we we're here:
- Defined and documented maximum restart delay.
- Fixed typo in a comment.
- Remove unused includes

Reviewed by:	cperciva, kevans
This commit is contained in:
Ihor Antonov 2023-12-27 00:07:25 -06:00 committed by Kyle Evans
parent 97958f5d5c
commit a6f795cc89
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr.sbin/daemon/daemon.8
View file

@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd September 18, 2023
.Dd December 27, 2023
.Dt DAEMON 8
.Os
.Sh NAME
@ -151,6 +151,7 @@ option is used or not.
.It Fl R , Fl -restart-delay Ar restart_delay_seconds
Supervise and restart the program after the specified delay
if it has been terminated.
Valid values are 1-31536000 (up to 1 year).
.It Fl r , Fl -restart
Supervise and restart the program after a one-second delay if it has
been terminated.

26
usr.sbin/daemon/daemon.c
View file

@ -30,7 +30,6 @@
* From BSDI: daemon.c,v 1.2 1996/08/15 01:11:09 jch Exp
*/
#include <sys/param.h>
#include <sys/event.h>
#include <sys/mman.h>
#include <sys/wait.h>
@ -49,12 +48,14 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <strings.h>
#define SYSLOG_NAMES
#include <syslog.h>
#include <time.h>
#include <assert.h>
/* 1 year in seconds */
#define MAX_RESTART_DELAY 60*60*24*365
#define LBUF_SIZE 4096
enum daemon_mode {
@ -161,7 +162,7 @@ usage(int exitcode)
int
main(int argc, char *argv[])
{
char *p = NULL;
const char *e = NULL;
int ch = 0;
struct daemon_state state;
@ -209,9 +210,9 @@ main(int argc, char *argv[])
state.mode = MODE_SUPERVISE;
break;
case 'm':
state.stdmask = strtol(optarg, &p, 10);
if (p == optarg || state.stdmask < 0 || state.stdmask > 3) {
errx(6, "unrecognized listening mask");
state.stdmask = (int)strtonum(optarg, 0, 3, &e);
if (e != NULL) {
errx(6, "unrecognized listening mask: %s", e);
}
break;
case 'o':
@ -238,9 +239,10 @@ main(int argc, char *argv[])
break;
case 'R':
state.restart_enabled = true;
state.restart_delay = strtol(optarg, &p, 0);
if (p == optarg || state.restart_delay < 1) {
errx(6, "invalid restart delay");
state.restart_delay = (int)strtonum(optarg, 1,
MAX_RESTART_DELAY, &e);
if (e != NULL) {
errx(6, "invalid restart delay: %s", e);
}
break;
case 's':
@ -347,7 +349,7 @@ daemon_exec(struct daemon_state *state)
}
/* Main event loop: fork the child and watch for events.
* After SIGTERM is recieved and propagated to the child there are
* After SIGTERM is received and propagated to the child there are
* several options on what to do next:
* - read until EOF
* - read until EOF but only for a while
@ -434,7 +436,7 @@ daemon_eventloop(struct daemon_state *state)
if (event.flags & EV_ERROR) {
errx(EXIT_FAILURE, "Event error: %s",
strerror(event.data));
strerror((int)event.data));
}
switch (event.filter) {
@ -588,7 +590,7 @@ listen_child(int fd, struct daemon_state *state)
{
static unsigned char buf[LBUF_SIZE];
static size_t bytes_read = 0;
int rv;
ssize_t rv;
assert(state != NULL);
assert(bytes_read < LBUF_SIZE - 1);