From nobody Sun Feb 13 17:05:33 2022 X-Original-To: dev-commits-src-main@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 D3C4D19C1729; Sun, 13 Feb 2022 17:05:33 +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 4JxYdT5cBJz4VLy; Sun, 13 Feb 2022 17:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644771933; 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=eQWlXbESWpwWLTMda+3TfQ8l0Uh5fN6KaZwG+w06gTU=; b=OHJLZ6zeZ9C+mFh/b7V8Cunwn9Gla+MDlDBIiEEEBhcTETOtOEDHv71XongLxQ8FjR2vys +VNGPIZXkiUrvPOmpyTT+Xw4sk3gWGOgOTaVeFDYNGB8h5LOb4SCYTd5ixuOdUW7n+clJw QR5P/X7xuaESHOxio0TmRIumpCkviK+XRHVyNdI/cNDdyzHD1KDNhfTHg4M2UQ4EO/P0gV sOb3FzfGJ1wgq75BjUErTR3OMMBtYjVwiClPRRqyuPKq6RW/NZX8uyplvgVIud71Sy9z4a 0zWjQWaeHmZ7kxbJOKL0D3eraiT2Py0I+CIuriVpS2DhvVnaMwIi0TZUmmKBmA== 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 A04B31EF91; Sun, 13 Feb 2022 17:05:33 +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 21DH5X6J094171; Sun, 13 Feb 2022 17:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DH5XG4094170; Sun, 13 Feb 2022 17:05:33 GMT (envelope-from git) Date: Sun, 13 Feb 2022 17:05:33 GMT Message-Id: <202202131705.21DH5XG4094170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 93885bb04182 - main - Better help message if locate database does not exists List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93885bb04182c104be1ec410a5ccb105f1ec5ff2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644771933; 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=eQWlXbESWpwWLTMda+3TfQ8l0Uh5fN6KaZwG+w06gTU=; b=dWq5v6uW2dBfYchhfINtzxxjaP2SKvDi1AfN5r56E2codjwthf7UTzz6Mo9ah7e/tGK8ms WDSZ03qQEW+axLG1TS/xyTLaYQW08s9Ez8tXYZh+E+r5TT5kXAnRztXBX8qKD1Kz8qL17P vKbfgBF5QIrX3+W68cZurWkUocI2G6bIx9NfzqU+DlgCwwztlWxjrUnrfl3mbhZ0ogDkJK EmjE1Pd4sgX/ITyP7aRky86I6brmfQy+ZE/EhYlhbVzh/BseQYr90YjDRpa89XKIfjPl2X 5cNNkJ8YEcNmw2yDR/62+8TSG9s+JE7opPri1jyXhS5O2LNGHhtlzy6AaI19dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644771933; a=rsa-sha256; cv=none; b=pJszO+FVut+9V4CBZGK8eE81iWWSEKIF42BHldeKtU/+Q6q0LcBtUQpqgrpW0hfqPlAhIF vVe6nauaQxtNun/CM3szIwB7umaORa40k00pFH/6Y4Rx7dsmOf/ogjxvNoQF/D+RvQAaTB AgkV44n3jLauewdOKc4T2wbackJdAP+u9DcULJhioUIKKGTYYYDEEI7ePb3fJBZfTvKS+I Rcwq3sf3K94+yD4yA5YQDl52uWAT96txHiZ7OYYl/erlyGpRm1NYzCb5AFANpEp7NQe1lF uwEJOsB9RIat0BVqLtKCsLaO2siaUMlzuD1pJ9a0nYl5PUb463QiWAPB1LPHNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=93885bb04182c104be1ec410a5ccb105f1ec5ff2 commit 93885bb04182c104be1ec410a5ccb105f1ec5ff2 Author: Wolfram Schneider AuthorDate: 2022-02-13 17:00:22 +0000 Commit: Wolfram Schneider CommitDate: 2022-02-13 17:00:22 +0000 Better help message if locate database does not exists PR: 211501 Reported by: Oliver Peter Reviewed by: Pau Amma Differential Revision: https://reviews.freebsd.org/D34243 --- usr.bin/locate/locate/locate.c | 36 ++++++++++++++++++++++++++---------- usr.bin/locate/locate/util.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index 0bbd95ac696d..014fa7bcc301 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -124,6 +124,8 @@ extern int getwf(FILE *); extern u_char *tolower_word(u_char *); extern int check_bigram_char(int); extern char *patprep(char *); +extern void rebuild_message(char *db); +extern int check_size(char *db); int main(int argc, char **argv) @@ -216,7 +218,6 @@ main(int argc, char **argv) exit(0); } - /* * Arguments: * db database @@ -235,8 +236,16 @@ search_fopen(char *db, char **s) *(s+1) = NULL; } } - else if ((fp = fopen(db, "r")) == NULL) - err(1, "`%s'", db); + else { + if (!check_size(db)) + exit(1); + + if ((fp = fopen(db, "r")) == NULL) { + warn("`%s'", db); + rebuild_message(db); + exit(1); + } + } /* count only chars or lines */ if (f_statistic) { @@ -261,6 +270,7 @@ search_fopen(char *db, char **s) } #ifdef MMAP + /* * Arguments: * db database @@ -273,14 +283,20 @@ search_mmap(char *db, char **s) int fd; caddr_t p; off_t len; - if ((fd = open(db, O_RDONLY)) == -1 || - fstat(fd, &sb) == -1) - err(1, "`%s'", db); + + if (!check_size(db)) + exit(1); + + if (stat(db, &sb) == -1) + err(1, "stat"); + len = sb.st_size; - if (len < (2*NBG)) - errx(1, - "database too small: %s\nRun /usr/libexec/locate.updatedb", - db); + + if ((fd = open(db, O_RDONLY)) == -1) { + warn("%s", db); + rebuild_message(db); + exit(1); + } if ((p = mmap((caddr_t)0, (size_t)len, PROT_READ, MAP_SHARED, diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c index 1d15f83b6826..aba90b1deda7 100644 --- a/usr.bin/locate/locate/util.c +++ b/usr.bin/locate/locate/util.c @@ -41,8 +41,10 @@ #include #include #include +#include #include "locate.h" +#include "pathnames.h" char **colon(char **, char*, char*); char *patprep(char *); @@ -268,3 +270,37 @@ getwf(fp) } return(word); } + + +void +rebuild_message(char *db) +{ + /* only for the default locate database */ + if (strcmp(_PATH_FCODES, db) == 0) { + fprintf(stderr, "\nTo create a new database, please run the following command as root:\n\n"); + fprintf(stderr, " /etc/periodic/weekly/310.locate\n\n"); + } +} + +int +check_size(char *db) +{ + struct stat sb; + off_t len; + + if (stat(db, &sb) == -1) { + warnx("the locate database '%s' does not exists.", db); + rebuild_message(db); + return(0); + } + len = sb.st_size; + + if (len < (2 * NBG)) { + warnx("the locate database '%s' is less than %d bytes large.", db, (2 * NBG)); + rebuild_message(db); + return(0); + } + + return(1); +} +