From nobody Tue Jan 17 15:26:16 2023 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 4NxCQw4Mhzz2sZNr; Tue, 17 Jan 2023 15:26:16 +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 4NxCQw3GK6z4K8W; Tue, 17 Jan 2023 15:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673969176; 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=ATwCEDhjfP5mYtVWNLJz0cQlaxEGNe9vK6fctT5OSPM=; b=izbOsSVu0CGx+DlxtYNDpy9ebeiSKy0bG9TAfXT8hvC82YabaGbKf3UL2wT4yABrzv8iJL MZWoqlgGIt3amkuzY0L9TPpalN1Sh/9UJyYf4O+u7akTfej/qjsDkLq/RwLX/GYTErr3ML V5hcXuyWJTXY+2eUNMEe0v42ucvXG9xMRkRKLdNxE164pY/mWUXk6L33QdBKiOopz5UaPN /qQ5R0wFXnjWksmxwUSuf/SMdaFuB/IPM1IilS54ExBp8QtovD6tq98CY8+K8BAxplu8+y eZbymyISYxEpin3c+RIRDgJnraSy3SYu1xk3lkcTNMWpxkSe07a/m+ZrgWvtFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673969176; 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=ATwCEDhjfP5mYtVWNLJz0cQlaxEGNe9vK6fctT5OSPM=; b=Zv2GloEdvBWNxtSPQuxY9eO/0KXosYM4DLMFHVQiR/4Kufmn7bwkflk1BxaTdxnt/oLdcA VsdGuLkqBfmEaIG7mOaANdZXIeuYRQ3xG+ozIgEmAicDDwAnVnp3AScbWuBH4uJ+nHB+Lp qJfg2sCTYSAC5Gt1REvWLL9zaCRSIz/oJPKlGypdlSOQxaSuaJD4Mv9uV0xsqR3X3sobhj ce1ThpKNTfG1u+VNPmkoITTTcuKCKByizulEcv3wrFmh7cLG3LHHMkcqdPtc02S7MV8jO9 v+pU2c26EvHpe2+UXVpU0KYGF55T/S0+D+kk65v+ekpeZzRc5BHQ7Oo8hH+K1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673969176; a=rsa-sha256; cv=none; b=ppjGCo+OUncMZY2NY4fDjeH2b7Z2qgJbFAw4YF/5VWEOiachcwB7UkzTC9X99jgs5BXrkL 5+NMTmbd9atwFA//Qkg7ZRFz7sk+rWPMjv894WiF3rboxUDFXsCz4S8RYSY6zxM0MxpTwI aLmvXmsLW9rnNnP7bz0wZDXwt4Ma2vLp7HqqjXKrqu4chDIvGhtyqaDXmsybFjRubHxrIS 5/wZYyZbAkhBsjfXjt0AMeYq+01NqA2NAh8G0fSz3o7lr+5klcN1+C/SkLOQn1qvEdio3Q PbnRBgGg09/SG32pexhz78I1cmX/eLu9WNNOyhZx52US8+L8unPdG2P24xKKBg== 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 4NxCQw2D3WzcGy; Tue, 17 Jan 2023 15:26:16 +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 30HFQGpI090703; Tue, 17 Jan 2023 15:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30HFQGSB090702; Tue, 17 Jan 2023 15:26:16 GMT (envelope-from git) Date: Tue, 17 Jan 2023 15:26:16 GMT Message-Id: <202301171526.30HFQGSB090702@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: c96859847991 - main - df: Return non-zero status on write failure. 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: c968598479917f52022b86d0089a9835ddcf2799 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c968598479917f52022b86d0089a9835ddcf2799 commit c968598479917f52022b86d0089a9835ddcf2799 Author: Dag-Erling Smørgrav AuthorDate: 2023-01-17 13:40:05 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-17 15:25:28 +0000 df: Return non-zero status on write failure. While here, complete the libxo conversion and switch return value to standard constants. MFC after: 1 week Sponsored by: Klara, Inc. Differential revision: https://reviews.freebsd.org/D38097 --- bin/df/df.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/df/df.c b/bin/df/df.c index 627d8b1c861d..9f7588a68d4f 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -204,7 +203,7 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - rv = 0; + rv = EXIT_SUCCESS; if (!*argv) { /* everything (modulo -t) */ mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); @@ -226,14 +225,14 @@ main(int argc, char *argv[]) if (stat(*argv, &stbuf) < 0) { if ((mntpt = getmntpt(*argv)) == NULL) { xo_warn("%s", *argv); - rv = 1; + rv = EXIT_FAILURE; continue; } } else if (S_ISCHR(stbuf.st_mode)) { mntpt = getmntpt(*argv); if (mntpt == NULL) { xo_warnx("%s: not mounted", *argv); - rv = 1; + rv = EXIT_FAILURE; continue; } } else { @@ -246,7 +245,7 @@ main(int argc, char *argv[]) */ if (statfs(mntpt, &statfsbuf) < 0) { xo_warn("%s", mntpt); - rv = 1; + rv = EXIT_FAILURE; continue; } @@ -257,7 +256,7 @@ main(int argc, char *argv[]) * we've been given (-l, -t, etc.). */ if (checkvfsselected(statfsbuf.f_fstypename) != 0) { - rv = 1; + rv = EXIT_FAILURE; continue; } @@ -286,7 +285,8 @@ main(int argc, char *argv[]) prtstat(&totalbuf, &maxwidths); xo_close_container("storage-system-information"); - xo_finish(); + if (xo_finish() < 0) + rv = EXIT_FAILURE; exit(rv); } @@ -322,7 +322,7 @@ makevfslist(char *fslist, int *skip) if (*nextcp == ',') i++; if ((av = malloc((size_t)(i + 2) * sizeof(char *))) == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); return (NULL); } nextcp = fslist;