From nobody Thu Mar 09 05:35:12 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 4PXHvN64c2z3wBPR; Thu, 9 Mar 2023 05:35:12 +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 4PXHvN5Hxcz41by; Thu, 9 Mar 2023 05:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678340112; 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=OgSfiNXASb2kk1nx3H3WQOyqiia0/UP5U0z6YHEZW5I=; b=NKuGH9mh5sBpwIrvJiuCvauUMzH5g++yjXzytxPkJI6nQO6+4mOfiFZIp2nMjR3ldBwy0r 7sPFz842+QpCQPwyhcza9GsgDgvOEQGkyAREYXS6dhhGkyQJTI0rT5JCtjvixUdnBbT9Me rKze01u2SdnXhx1nPzfEWGqGkfT9EYdH5Hc+JXbggJJlhrT5GEGcAQHGfAlPcMJJTrKM7t +yXYnDFaZ2Cyq9oLPYSDsN2MTb/tCQ/bE4goWN6RYP7R0p6j1TPmF2AoRVunVTlwk9QXTW 05IxeyURfATBMrYNb/+rYu2aQQ5etiopvOF4b2W4upyn/0VLBE6Dx5cgwoSrTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678340112; 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=OgSfiNXASb2kk1nx3H3WQOyqiia0/UP5U0z6YHEZW5I=; b=Y9+SLQW007nYnEl89kwLn2sKqEyd8e1yeks5CrS2uzqWV2RhYj0OuTSpqxG77cdP5gvJu+ f0lUnUufojD0v2g+0U16Ym8i+QtTk/QiYkEckPeIV2t/4sOAcRZii4B0BfQ2fzb3iI4+Ey uAttaOQOiwKwmmSlOtwVuUoCM7gvtCtQf9BgePHh0m2pNU28sFbGmpF2kgTD207QfYdbDk Yf9mNA+Bk97TnEiv+shjFpuduPVtgBP+3CI7FV+8LCF7RM3YZTCAylHATZBAd06Nj3bgqa 8fQ7RWUz9PlxKQ322fQCi+4JvhHeIFnq/dh+0tzI9W2voDoZatCD5e8Akz45ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678340112; a=rsa-sha256; cv=none; b=jyiBVlWvRUzCNSp8KrrcTVuPxKs6c1JlIimihKnhgBDFrCBSXX1dtJezEnZE8b6e+f+9CR TFrKzoFzOOnJtCsGY5WVuJDunS8pKBeLYBPEj/OZRO5mXOkuUdizAWReGk7WcEMfGA0zct pU7iU0NByO0rPuSXhlHJ0A5oBRn8hlZs5v9O5/Wx3+rtpkpvU7LWVkh80adyHyFuZ5ChDi 2JMIllYwBf+oZgxKJLtGjRWDjsqj3AW8vQmslCBOCSUeuJmJlmZAtqalHucKJqWiSXLgG+ sMFZRwnX9v/ZWUcuYdZ9mjscjs1lUBSK7buFltICIoQzE/C0yUrkbAgQKcTKig== 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 4PXHvN4N9pzw9c; Thu, 9 Mar 2023 05:35:12 +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 3295ZC9r045077; Thu, 9 Mar 2023 05:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3295ZC0B045076; Thu, 9 Mar 2023 05:35:12 GMT (envelope-from git) Date: Thu, 9 Mar 2023 05:35:12 GMT Message-Id: <202303090535.3295ZC0B045076@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: f6d6c6688900 - main - grep: remove tautological condition 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: f6d6c66889001208aee7b0c46efe1c8ddffda57c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f6d6c66889001208aee7b0c46efe1c8ddffda57c commit f6d6c66889001208aee7b0c46efe1c8ddffda57c Author: Kyle Evans AuthorDate: 2023-03-09 05:29:30 +0000 Commit: Kyle Evans CommitDate: 2023-03-09 05:34:22 +0000 grep: remove tautological condition st_size is an off_t, it cannot hold values larger than OFF_MAX. CID: 1008931 --- usr.bin/grep/file.c | 3 +-- usr.sbin/pkg/config.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/pkg/config.h | 1 + usr.sbin/pkg/pkg.c | 5 +++++ 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index 8577572c2887..787e8fbe03bb 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -186,8 +186,7 @@ grep_open(const char *path) if (filebehave == FILE_MMAP) { struct stat st; - if ((fstat(f->fd, &st) == -1) || (st.st_size > OFF_MAX) || - (!S_ISREG(st.st_mode))) + if (fstat(f->fd, &st) == -1 || !S_ISREG(st.st_mode)) filebehave = FILE_STDIO; else { int flags = MAP_PRIVATE | MAP_NOCORE | MAP_NOSYNC; diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 08e206b93511..6902cfe41b7c 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -567,3 +567,58 @@ config_finish(void) { for (i = 0; i < CONFIG_SIZE; i++) free(c[i].value); } + + +static int +config_value(const char *key) +{ + const struct config_entry *cp; + + for (size_t i = 0; i < nitems(c); i++) { + cp = &c[i]; + + if (strcmp(cp->key, key) == 0) { + switch (cp->type) { + case PKG_CONFIG_STRING: { + const char *val; + + (void)config_string(i, &val); + printf("%s\n", val); + break; + } + case PKG_CONFIG_BOOL: { + bool val; + + (void)config_bool(i, &val); + printf("%s\n", val ? "yes" : "no"); + break; + } + } + + return (0); + } + } + + return (ENOENT); +} + +int +config_show(int argc, char *argv[]) +{ + int error; + + if (argc != 1) { + fprintf(stderr, "Usage: pkg -N config \n"); + return (1); + } + + config_init(NULL); + error = config_value(argv[0]); + config_finish(); + + if (error == ENOENT) { + fprintf(stderr, "pkg: No such configuration options: %s\n", + argv[0]); + } + return (error); +} diff --git a/usr.sbin/pkg/config.h b/usr.sbin/pkg/config.h index 87efd3c29e94..8cb878291a7e 100644 --- a/usr.sbin/pkg/config.h +++ b/usr.sbin/pkg/config.h @@ -62,6 +62,7 @@ typedef enum { int config_init(const char *); void config_finish(void); +int config_show(int, char *[]); int config_string(pkg_config_key, const char **); int config_bool(pkg_config_key, bool *); diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 7b574dc42db2..3d4119d85bf8 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -1195,6 +1195,11 @@ main(int argc, char *argv[]) else if (strcmp(command, "bootstrap") == 0) { bootstrap_only = true; } + else if (strcmp(command, "config") == 0 && + activation_test) { + exit(config_show(argc - optind, + argv + optind)); + } } // bootstrap doesn't accept other arguments else if (bootstrap_only) {