From nobody Sun Jan 30 09:27:35 2022 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 6C65E198F563; Sun, 30 Jan 2022 09:27:35 +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 4Jmm7W2gJRz3mLC; Sun, 30 Jan 2022 09:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643534855; 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=75dqP3XEFRHcC0vV8TJttKBjFHXRRBoJGviEZJm+SaI=; b=NATKLVpwemhFIzBz1/RVh5pL2LpQDNZwtgnI4FH9wtlpNs8jUntuuupet+IF4GJfOoOkSH IvjxtxW6GOKrbVwz0nM08QQHYJZYCHf1nzFSEnjKUUuLD05BX9caR1+VP28/k3cRoymuQd 3Jc8r7DcnwKBiaJ3KoXuJJBb6jktZm9SWvd7YAeOf6Rmfgy2rMpulk9KeMWkgYX7FnewP7 SKxsPA5MhOZ3VuJ8lb/SfW73uVGk2yevgOEI8R8w5IYRM0MNM4cXA9fmKsbrtCb618V5RQ qZkNkJbPexIMUbGmQkNB0QmIgPvdEZ6cVmeEJ07EhI0+NNwd5pxiA+es/TKbRQ== 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 397822658C; Sun, 30 Jan 2022 09:27:35 +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 20U9RZnx022199; Sun, 30 Jan 2022 09:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20U9RZ30022198; Sun, 30 Jan 2022 09:27:35 GMT (envelope-from git) Date: Sun, 30 Jan 2022 09:27:35 GMT Message-Id: <202201300927.20U9RZ30022198@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: 72a0982cd529 - main - improve error handling 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72a0982cd529c7cdeee7fd4eb7b1fd8bfdd545cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643534855; 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=75dqP3XEFRHcC0vV8TJttKBjFHXRRBoJGviEZJm+SaI=; b=qb7CC6RDiT4d30utpgNY8GaSEbkGYxNpeZx/XjV56rDErqhC+01ON5ZpCEO9NgTjhJK/oA dSSDCvcUpwdPVEvhSFlPUSFYZGBYbWFKjLmD1Vxolfw/FFdosGSiqiZC5z74F75Eq7elX/ gszgDoqvQQIkMCIbqTI+B+Uug7qWaE5GUQvq1HtaSlTN5bO3GmvYc76AfIIzE3dptTLZX6 IDSZfLec6sbrC7hTXPPtfUyjhPTw6vxvWMHQbZmiaC5mZV9oRqsLd/pGGHQayLzeyNZA5T JPRR1/mH/HSsMumwT3EkXCty+z5NLMb7n1/+BbZzWeMYnk/NKaNEnzIF0gE2cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643534855; a=rsa-sha256; cv=none; b=QLb7+XQ6nOTYgvd5+T3aPNrrvbkIEwBu/pxaNEmRBAYImneIIs/61/1JsCOUvihe8UUhnz ORqvK9+7Dcbz2XPI9/0M1XP7rj5ZlH6u76EWmXQAThh7JF67CRudnjzIgqpsXxK8A4flji Ea1oChNKfYgEcvnRUNJivUHAPRh50D0uDxplgUGUk5ztWx7vvC8mhemv+oR1qv30+J9GJ/ aNFw+fqjXKnao9UeALNww8aK0V5edQBzjDB5oBSSF9xIu+TIs4894OnorBo4fFWTKMpJbf D89Oz/eGWzpVMZ6kTD5ZUT4NZmNLuQMQcTsUP8HtO4IEn8BvUJ20BY8HoYm55w== 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=72a0982cd529c7cdeee7fd4eb7b1fd8bfdd545cb commit 72a0982cd529c7cdeee7fd4eb7b1fd8bfdd545cb Author: Wolfram Schneider AuthorDate: 2022-01-30 09:27:21 +0000 Commit: Wolfram Schneider CommitDate: 2022-01-30 09:27:21 +0000 improve error handling --- usr.bin/locate/code/locate.code.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index 4decf5a2e864..23fa043b12af 100644 --- a/usr.bin/locate/code/locate.code.c +++ b/usr.bin/locate/code/locate.code.c @@ -144,7 +144,8 @@ main(int argc, char *argv[]) err(1, "%s", argv[0]); /* First copy bigram array to stdout. */ - (void)fgets(bigrams, BGBUFSIZE + 1, fp); + if (fgets(bigrams, BGBUFSIZE + 1, fp) == NULL) + err(1, "get bigram array"); if (fwrite(bigrams, 1, BGBUFSIZE, stdout) != BGBUFSIZE) err(1, "stdout"); @@ -246,9 +247,11 @@ main(int argc, char *argv[]) oldpath = buf2; } } + /* Non-zero status if there were errors */ if (fflush(stdout) != 0 || ferror(stdout)) - exit(1); + errx(1, "stdout"); + exit(0); }