From nobody Mon Aug 8 19:07:15 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 4M1m0g4zWHz4Yqvw; Mon, 8 Aug 2022 19:07:15 +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 4M1m0g4PMpz3dwD; Mon, 8 Aug 2022 19:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659985635; 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=lVHUJrwOOAqqbFnrcMezOafD5racQ/bNXliMleZcVjk=; b=myAy0SFvTa0jYMPY8tXNBkZot1nbdUVHdrS5csywN+D76KBNclZY4VYprzbXZmzJHQ23qM H5FCJReOTG9CN89gZRPqy4bTT2N/WXZnIz4TPOLWAgYlRNXBSN9hiii9OO9nF6vWuP7fhB 7qYMEouil7Xm00jLvJyfF+WZm2RhKW3dz9v9efGWt5pwjykVVZZFrKNJ4tbCPSwFGW3jZd /1mMvpaIgyQU+Bm7S1xxajTWL80XUsPgSUU+CbFN/xkM3a/ErdBi7ARfb9czqi2ECMnRgc FpLXXtbZOqgqWVWxuyASd1jYPaOTpu50YFHjGVRht3McWDviOt7OiolDmC4n8w== 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 4M1m0g3TYcz13MP; Mon, 8 Aug 2022 19:07:15 +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 278J7FpO097263; Mon, 8 Aug 2022 19:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278J7FlQ097262; Mon, 8 Aug 2022 19:07:15 GMT (envelope-from git) Date: Mon, 8 Aug 2022 19:07:15 GMT Message-Id: <202208081907.278J7FlQ097262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 441202c00bdf - main - apply: clean up error handling. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 441202c00bdf6edbf6b6bc1b1923bebd8e2d8e45 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659985635; 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=lVHUJrwOOAqqbFnrcMezOafD5racQ/bNXliMleZcVjk=; b=dO6lb5Qg692fYhUpaMtjxi3Lmrk4OPLtwSDfA6hYeaZJjyJiySBh/e8+z/2yE7HNnoPZrL 1yXa5fijnV6igBp8k0utOTmqpvRvYBu8jW/vChhDP7qCUo3lXfQTxS5DWrc22+wYsySJOh UZuXw/zMMrPvAK9g8rDmjy/3G1qHs6umRktrGMvQO3JUWiUjkSjIDn3T9Iw2CBVcgYDJCy YEuUvcjhXYTj5FIbk1HF3xkka9lN8A3vhpSoFV/JB2Q+09VUKwrazMi6/bCDaO9bBtd+3E 8NenhQ8fDzDrFIF0yRM4bADEHlAJ6IMia1CNcVd/dmpiC5z8EdLZH/7oyBGkDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659985635; a=rsa-sha256; cv=none; b=luhaYk1dtWTyuUF6vsfDHehdHrXRs512u6+C+6OM/dnc34so2QAJdfebwfgNFnXUr6d6dy WAAHpv+XIOYGj1lq1v/oflse2ZqtwUgpEny8J0jvZDQY5vLE6FFhGgdegVewbS8gYNEaKH CUOVj/puqrBnuE0GqPisDuKqnh7R4S8pyXpBvG2L0KifPal0hb70l5N6iDushPfLoqdzG4 H/6G3f9E1bGSAX6ik4g28fKB+7HGUiOx2m8rWzVfxOQCMpkhidtCN9L4clfR6h7iJDjG3P u1KvHUv0RAQnXyNTq282SImP25xJA44Al+6f9F7wi8uH3vWY6BmDhlbk7M1Rkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=441202c00bdf6edbf6b6bc1b1923bebd8e2d8e45 commit 441202c00bdf6edbf6b6bc1b1923bebd8e2d8e45 Author: Dag-Erling Smørgrav AuthorDate: 2022-08-08 19:06:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-08-08 19:06:35 +0000 apply: clean up error handling. Sponsored by: Klara, Inc. --- usr.bin/apply/apply.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 3cba41c37e64..fc90af6d3dff 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -176,23 +176,24 @@ main(int argc, char *argv[]) */ for (rval = 0; argc > nargs; argc -= nargs, argv += nargs) { sbuf_clear(cmdbuf); - sbuf_cat(cmdbuf, "exec "); + if (sbuf_cat(cmdbuf, "exec ") != 0) + err(1, "sbuf"); /* Expand command argv references. */ for (p = cmd; *p != '\0'; ++p) { if (ISMAGICNO(p)) { - if (sbuf_cat(cmdbuf, argv[(++p)[0] - '0']) - == -1) - errc(1, ENOMEM, "sbuf"); + if (sbuf_cat(cmdbuf, argv[*++p - '0']) != 0) + err(1, "sbuf"); } else { - if (sbuf_putc(cmdbuf, *p) == -1) - errc(1, ENOMEM, "sbuf"); + if (sbuf_putc(cmdbuf, *p) != 0) + err(1, "sbuf"); } if (sbuf_len(cmdbuf) > arg_max) errc(1, E2BIG, NULL); } /* Terminate the command string. */ - sbuf_finish(cmdbuf); + if (sbuf_finish(cmdbuf) != 0) + err(1, "sbuf"); /* Run the command. */ if (debug)