From nobody Fri Mar 3 05:17:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PSbnZ6mJlz3whPR; Fri, 3 Mar 2023 05:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSbnZ6Czcz3l9s; Fri, 3 Mar 2023 05:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TdsQHEZvuKE1N+VPYaQ3i8Nerb4y0c9IPxZU1wOFFgE=; b=XeEZBKk8C53R1q5nvvbZp8qFiNfRng6hUrAyNKf77YAR3ZHjIWEHVyi1GTDLQfD/Gbaln0 /YQWTGackwHxXJeASH0mYKV5Kt6D16qI22ML/8Qw11cb9mZhrCB2r0aKLvA36sS0bdy3bU zYnES7QIIbAaUshwwFdtxi8bt+h1xf3+9MSb6TG0debbE2gYFQP49fa8rMjbQr0MCJN9qz AMw7+p+EY9JoKDMWTU+StuwQ5P8YoBx3tSUKhVYp4J/KHetqo8TXw1Fmi6MdpAoZHIO6bV iVAaMTm//NqMC7E4LiSBYf2+jHxLvpZinhqlb9MA60NHJdIy9A7TfQdtfUc6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TdsQHEZvuKE1N+VPYaQ3i8Nerb4y0c9IPxZU1wOFFgE=; b=hVevKVFWpGSgvFbmqQsrppfBhlF5VSVwcwxxFamD5f6koJMvCxLkel961kimZZ0CSCKL/H HFQN6C7asyjFMKIiMLGm5JmAy+IugnKKdrN3IKw8DxmCNAhIyL98a5YyqAL6OtEL0UZyHa dlKW1aHPRz9ktYXd87pxxPt9iiqC6W8cmGs+ni3IioeLuuhhnX8rbdoDQl7OK54Hr7818z 0z+SYAizsvFLnbFPjIJpx9Esk9+AW2m1ix8TFmeMGPyoHcyl6AW/LFlCz3xk9+7IGrqu41 oA7nAPZE9cN886EJwW0I7EQj67+xxsufC/BtEm6Q7XscMPV9zmqqjZwrgExN6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820642; a=rsa-sha256; cv=none; b=Rwzl2iyzYR/+yVtTc8gVYAXDyiTP4o70uYVSvE+VkJejntI/VY0vP3J5yDgSHg/baez/9E QL4D+Kvlw7TuT0JvqIPvRFA6fSDMKgRkRItEf5hg/kVsq3S+5iqueu0o9XdGpydoYeoXct UYsk2B3Jfm9wbmiv0I5/hPu5EPflIg7WIASZtw/2Lcb/Sgv/6dF+V79yPzBFW9LERftE0Y J7jhq8e0BgHMdbvZ9FkaDJvfn4+FV94FR0MD5XJqbPmPxDK2P3VkqXA2/f6CCfgrQ/56ba mFMzEvsgmMJ/4VYLiy4kunksV3WITecLyaXQulG43VZj+da384TqGQ1sFtjO/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbnZ4xwczlN1; Fri, 3 Mar 2023 05:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3235HMkn019588; Fri, 3 Mar 2023 05:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HMI7019587; Fri, 3 Mar 2023 05:17:22 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:22 GMT Message-Id: <202303030517.3235HMI7019587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 39ea4280e4c5 - main - daemon: style changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39ea4280e4c5e41f237e55770f4f62b04b24d899 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=39ea4280e4c5e41f237e55770f4f62b04b24d899 commit 39ea4280e4c5e41f237e55770f4f62b04b24d899 Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:01 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:01 +0000 daemon: style changes This is not a functional change. - Clean up whitespace (spaces where there should be tabs) - Break up lines that are longer than 80 Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 75 ++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index af387574c4b5..16e22efed68e 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -138,7 +138,7 @@ usage(int exitcode) " --syslog-tag -T Set syslog tag\n" " --help -h Show this help\n"); - exit(exitcode); + exit(exitcode); } int @@ -165,7 +165,7 @@ main(int argc, char *argv[]) .keep_fds_open = 1, .output_fd = -1, .output_filename = NULL - }; + }; struct pidfh *parent_pidfh = NULL; struct pidfh *child_pidfh = NULL; sigset_t mask_orig; @@ -190,17 +190,18 @@ main(int argc, char *argv[]) log_reopen = true; break; case 'l': - logparams.syslog_facility = get_log_mapping(optarg, facilitynames); + logparams.syslog_facility = get_log_mapping(optarg, + facilitynames); if (logparams.syslog_facility == -1) { errx(5, "unrecognized syslog facility"); - } + } logparams.syslog_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); if (p == optarg || stdmask < 0 || stdmask > 3) { errx(6, "unrecognized listening mask"); - } + } break; case 'o': logparams.output_filename = optarg; @@ -218,13 +219,14 @@ main(int argc, char *argv[]) restart = strtol(optarg, &p, 0); if (p == optarg || restart < 1) { errx(6, "invalid restart delay"); - } + } break; case 's': - logparams.syslog_priority = get_log_mapping(optarg, prioritynames); + logparams.syslog_priority = get_log_mapping(optarg, + prioritynames); if (logparams.syslog_priority == -1) { errx(4, "unrecognized syslog priority"); - } + } logparams.syslog_enabled = true; break; case 'S': @@ -240,9 +242,9 @@ main(int argc, char *argv[]) case 'u': user = optarg; break; - case 'h': + case 'h': usage(0); - __builtin_unreachable(); + __builtin_unreachable(); default: usage(1); } @@ -252,22 +254,23 @@ main(int argc, char *argv[]) if (argc == 0) { usage(1); - } + } if (!title) { title = argv[0]; - } + } if (logparams.output_filename) { logparams.output_fd = open_log(logparams.output_filename); if (logparams.output_fd == -1) { err(7, "open"); - } + } } if (logparams.syslog_enabled) { - openlog(logparams.syslog_tag, LOG_PID | LOG_NDELAY, logparams.syslog_facility); - } + openlog(logparams.syslog_tag, LOG_PID | LOG_NDELAY, + logparams.syslog_facility); + } /* * Try to open the pidfile before calling daemon(3), @@ -359,7 +362,7 @@ main(int argc, char *argv[]) restart: if (pipe(pfd)) { err(1, "pipe"); - } + } /* * Spawn a child to exec the command. */ @@ -387,7 +390,7 @@ restart: if (user != NULL) { restrict_process(user); - } + } /* * When forking, the child gets the original sigmask, * and dup'd pipes. @@ -396,21 +399,21 @@ restart: close(pfd[0]); if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { err(1, "sigprogmask"); - } + } if (stdmask & STDERR_FILENO) { if (dup2(pfd[1], STDERR_FILENO) == -1) { err(1, "dup2"); - } + } } if (stdmask & STDOUT_FILENO) { if (dup2(pfd[1], STDOUT_FILENO) == -1) { err(1, "dup2"); - } + } } if (pfd[1] != STDERR_FILENO && pfd[1] != STDOUT_FILENO) { close(pfd[1]); - } + } } execvp(argv[0], argv); /* @@ -471,7 +474,7 @@ restart: } if (restart && !terminate) { daemon_sleep(restart, 0); - } + } if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) { warn("sigprocmask"); goto exit; @@ -487,7 +490,7 @@ exit: close(pfd[1]); if (logparams.syslog_enabled) { closelog(); - } + } pidfile_remove(child_pidfh); pidfile_remove(parent_pidfh); exit(1); /* If daemon(3) succeeded exit status does not matter. */ @@ -501,7 +504,7 @@ daemon_sleep(time_t secs, long nsecs) while (!terminate && nanosleep(&ts, &ts) == -1) { if (errno != EINTR) { err(1, "nanosleep"); - } + } } } @@ -545,7 +548,7 @@ get_log_mapping(const char *str, const CODE *c) for (cp = c; cp->c_name; cp++) if (strcmp(cp->c_name, str) == 0) { return cp->c_val; - } + } return -1; } @@ -557,11 +560,11 @@ restrict_process(const char *user) pw = getpwnam(user); if (pw == NULL) { errx(1, "unknown user: %s", user); - } + } if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) { errx(1, "failed to set user environment"); - } + } setenv("USER", pw->pw_name, 1); setenv("HOME", pw->pw_dir, 1); @@ -587,7 +590,7 @@ listen_child(int fd, struct log_params *logpar) if (do_log_reopen) { reopen_log(logpar); - } + } rv = read(fd, buf + bytes_read, LBUF_SIZE - bytes_read - 1); if (rv > 0) { unsigned char *cp; @@ -610,7 +613,7 @@ listen_child(int fd, struct log_params *logpar) /* Wait until the buffer is full. */ if (bytes_read < LBUF_SIZE - 1) { return 1; - } + } do_output(buf, bytes_read, logpar); bytes_read = 0; return 1; @@ -644,17 +647,19 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) if (len < 1) { return; - } + } if (logpar->syslog_enabled) { syslog(logpar->syslog_priority, "%.*s", (int)len, buf); - } + } if (logpar->output_fd != -1) { if (write(logpar->output_fd, buf, len) == -1) warn("write"); } - if (logpar->keep_fds_open && !logpar->syslog_enabled && logpar->output_fd == -1) { + if (logpar->keep_fds_open && + !logpar->syslog_enabled && + logpar->output_fd == -1) { printf("%.*s", (int)len, buf); - } + } } /* @@ -666,7 +671,7 @@ handle_term(int signo) { if (pid > 0 && !child_gone) { kill(pid, signo); - } + } terminate = 1; } @@ -709,7 +714,7 @@ reopen_log(struct log_params *logparams) outfd = open_log(logparams->output_filename); if (logparams->output_fd >= 0) { close(logparams->output_fd); - } + } logparams->output_fd = outfd; }