From nobody Wed Nov 18 07:40:26 2026 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 4jTtmq0BM1z6yxcg for ; Wed, 18 Nov 2026 07:40:27 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTtmp4btJz4Hd3 for ; Wed, 18 Nov 2026 07:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794987626; 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=m/J9dAEst5nDRaLZSFS79kXsXrLrLwmUIF86GP1P6/U=; b=P0lrz4eqyU5ketwiDah+r26uhnDQscg43N03Cvnn90ZwMwYDFp3RIvbKFIZNyMhHhjCQFU DE/qqzXowuQRPXaJ12BDqiFU1Vwjk5s2aaOFoXFLCgskItKzyfDhDbHYpphFmeP+4MRSrL jGeSBQaJG94m85GWWGNtHRRSsqvl8LRmtI9WB2yLgNBaPPdqRT9KYo0sG9PGfnMZDOl5y5 rf+scUpAMtGKNuQFiAyGP8TSutk44L6VQSJZAB8XUFvhjnCyMdTVJyMYF2A2BnrZ6So9Ym kAKYoUhcI55wSDf7SvOHHRkbj7yJph1m3xk3SJHa57nbENi5UFr+KLay4dAWuA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794987626; b=Px7gTPgbCMK6xOdXRbE+xyXSt412vusjEwMT2R14ucnQx6/MgrPiFXWeggsLpZHxWRzyEf qBcZiGlmb+J2CGwHIrjFVVWwohJ8+TEvdx1Lp1b2ier4VLl2jI/9SAJcz1yZp2B0Rtaj97 o9d2hBISb4o24KY0VNGvpNdANjANRPJhs5vFaw5WzgfVkR325kvjjA6rIQ16cKkzTcwzFw F2e9qfNroTwCQnVHCU5LQ48TvxwfO1xHz2c8PC2SJIr+zjzl0wpwDYOl5vASYS5uyjZ+VR Vh6/G8Rb5NOJqSyAQ69Dc1wmlL9Yd/jopaL236WLxhmIGDUdEesvDspUXK20cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794987626; 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=m/J9dAEst5nDRaLZSFS79kXsXrLrLwmUIF86GP1P6/U=; b=pBqoYGP4ZTYrrC4XeGdj1TxNeSVUm6bqQghCtDRh4ditNnu8K9Fegps0+OXEPiW1TSM2i9 DulGqvQWa4hfZuvLGMbqkN6YI4sA4NxQxy02lbyVOOPMqdlpe8s59QL6Xp62vqrbXa67Fa C2inMQ037DLuiblg+GO90isYsdcyXQ9pJ3kQZOn3nbELRepzUhTOMpof/WPAsE819Q+IyO CYwkaFZEAI+5EOkuYA5jEbxt+RTpm+zBFcQ4TTWj8DDw6zBO8SwEcMPb+X4oaS4m/055MO Hy6pkSyMjUQjhLjuhWhun9pUhLH78ZYgBvF2yhp5FOv3zqLwzwBFJ2PxFrotVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTtmp3XhXz1JN8 for ; Wed, 18 Nov 2026 07:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1508a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 07:40:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: fbbf68558db0 - main - soelim: fix error detection and exit status List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbbf68558db0dc697198579c588ff59271cf7949 Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 07:40:26 +0000 Message-Id: <6afd566a.1508a.118ed620@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=fbbf68558db0dc697198579c588ff59271cf7949 commit fbbf68558db0dc697198579c588ff59271cf7949 Author: Baptiste Daroussin AuthorDate: 2026-11-18 06:16:50 +0000 Commit: Baptiste Daroussin CommitDate: 2026-11-18 07:40:20 +0000 soelim: fix error detection and exit status --- usr.bin/soelim/soelim.c | 20 +++++++++++++++----- usr.bin/soelim/tests/soelim_test.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c index 59328ba04874..51f3203c067f 100644 --- a/usr.bin/soelim/soelim.c +++ b/usr.bin/soelim/soelim.c @@ -79,16 +79,18 @@ soelim_fopen(const char *name) } static int -soelim_file(FILE *f, int flag) +soelim_file(FILE *f, const char *name, int flag) { char *line = NULL; char *walk, *cp; size_t linecap = 0; ssize_t linelen; + int ret; if (f == NULL) return (1); + ret = 0; while ((linelen = getline(&line, &linecap, f)) > 0) { if (strncmp(line, ".so", 3) != 0) { printf("%s", line); @@ -115,7 +117,7 @@ soelim_file(FILE *f, int flag) printf("%s", line); continue; } - if (soelim_file(soelim_fopen(walk), flag) == 1) { + if (soelim_file(soelim_fopen(walk), walk, flag) == 1) { free(line); return (1); } @@ -123,10 +125,14 @@ soelim_file(FILE *f, int flag) printf("%s", cp); } + if (ferror(f)) { + warn("%s", name); + ret = 1; + } free(line); fclose(f); - return (0); + return (ret); } int @@ -163,12 +169,16 @@ main(int argc, char **argv) argv += optind; if (argc == 0) - ret = soelim_file(stdin, flags); + ret = soelim_file(stdin, "stdin", flags); for (i = 0; i < argc; i++) - ret = soelim_file(soelim_fopen(argv[i]), flags); + if (soelim_file(soelim_fopen(argv[i]), argv[i], flags) != 0) + ret = 1; sl_free(includes, 0); + if (fflush(stdout) != 0) + err(EXIT_FAILURE, "stdout"); + return (ret); } diff --git a/usr.bin/soelim/tests/soelim_test.sh b/usr.bin/soelim/tests/soelim_test.sh index 7fb70a1f71e9..5624a991ca35 100755 --- a/usr.bin/soelim/tests/soelim_test.sh +++ b/usr.bin/soelim/tests/soelim_test.sh @@ -95,8 +95,42 @@ files_body() } +atf_test_case errors +errors_head() +{ + atf_set "descr" "error handling" +} + +errors_body() +{ + cp $(atf_get_srcdir)/basic . + + # A failure on one file is not hidden by a later success. + atf_check \ + -o ignore \ + -e ignore \ + -s exit:1 \ + soelim doesnotexist $(atf_get_srcdir)/basic.in + + # A read error is not reported as an empty file. + mkdir dir + atf_check \ + -o empty \ + -e ignore \ + -s exit:1 \ + soelim dir + + # Write errors are not ignored. + atf_check \ + -o empty \ + -e ignore \ + -s exit:1 \ + sh -c 'soelim basic.in > /dev/full' +} + atf_init_test_cases() { atf_add_test_case stdin atf_add_test_case files + atf_add_test_case errors }