From nobody Mon Apr 29 14:22:51 2024 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 4VSlsm1kJpz5JR0b; Mon, 29 Apr 2024 14:22:52 +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 4VSlsm0xC5z4Gy4; Mon, 29 Apr 2024 14:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714400572; 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=+zZhuPnttFn4IivtQSqjghico5z2OVapxk/lpwiUOMQ=; b=E5EjiUTo30+CtWGlM5SN8YR0omg96e5S9zZXohCRzV0D1jnhq+1vhnTrhqKEMSlDOWXemQ soGRvAVqNlpRC1QbbG5r+R2ZuUcKzccs+iPVycGg9+wyMnRt87oqWKVysE3zouaoy2/cKZ ajUz1n//vBHmcjMGBCD2Ou+ToRYJCzyzNeNtBMxHuZgqaPK2/EVk/dqXn5TPStFtEj+eK6 rlOKAC6eGISOxD1cG+OFORCIas4ye3x9QHgQnO48PGSlvwjh4NbEEvaxUHkNKqnD8DhOU1 8AWjS8sEhzAuOnN26kDgZBRqmRwSLAFLIMuAZZnrVmElB34uwaR7rYWHsci0cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714400572; a=rsa-sha256; cv=none; b=TbeDPMw3X1nvhfycE/giOk5meKrHMOuZq/NMjffF4XkIldu+rT1iUuAN8DfigxsuxF6S5U VWA7dxQgGUXcWXIJW4WQsw++zXP8MZTOXYkWi8ISlXlcmWFO6Zdsm1ptsafAzfGl8N+97I DTPWen99pCIukz5W3JpilCEiQ3GuHVV0inFYYnsOOdwYZcM79l3tSweLt/NvwK/c3wdcbl Mfu0tjXn0tky/QcF3VrbxRZ5r0U9fy0UQvbuvIv8ENb/IVuqbXL0jBvWghsyDsEE2n1pFH jGWUsmicCxobyeyilC0dJGBfJHZVBualynjDO9lu5XkVMlj1KaMtzYnv3gH5qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714400572; 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=+zZhuPnttFn4IivtQSqjghico5z2OVapxk/lpwiUOMQ=; b=pB14mqjrn1ei4OfgSCwxgCS4SNfcP1dD1pWtOY2oYQt59Y0ULoRgg5UG3z1nHa4x6lLy94 NWPDMXGH0F/Z0kXq0GiYsqMc2OJhPjYK1zC79yeWUF9JQ4VcLpHRyx1FZLh364GrsgD5Jr ys/4gPMO0JT6/smn8Pe55g1GdvKzukMv2us9loS2+TxOhwxKEnomoAmuvfHkeMOhv5j1rG esb9axB80qTpwjrDScraLxEb10pop32CEVu2ewmcX7cD8VYVcO/vupW5lVINbxk0LlW/Zy KvzYpwh/B7RK8xWRBTqDguDVKSKgV25TTcyUIyDkAGpc0gVgThTxOxR5W6SKvg== 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 4VSlsm0XY8z1BwF; Mon, 29 Apr 2024 14:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TEMpDt062957; Mon, 29 Apr 2024 14:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TEMpJZ062954; Mon, 29 Apr 2024 14:22:51 GMT (envelope-from git) Date: Mon, 29 Apr 2024 14:22:51 GMT Message-Id: <202404291422.43TEMpJZ062954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b2b8fa1a64af - main - Add libxo support to du 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2b8fa1a64af81e940d7b3ab71fd4c583b4abe0f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b8fa1a64af81e940d7b3ab71fd4c583b4abe0f commit b2b8fa1a64af81e940d7b3ab71fd4c583b4abe0f Author: Nathan Huff AuthorDate: 2024-04-29 04:59:18 +0000 Commit: Warner Losh CommitDate: 2024-04-29 14:22:39 +0000 Add libxo support to du Convert du to use libxo enabling structured output. [[ minor style fixes by imp ]] Signed-off-by: Nathan Huff Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1145 --- usr.bin/du/Makefile | 2 +- usr.bin/du/du.1 | 12 ++++++++++- usr.bin/du/du.c | 57 ++++++++++++++++++++++++++++++++++------------------- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile index 38f638a04de6..7fb61d0423df 100644 --- a/usr.bin/du/Makefile +++ b/usr.bin/du/Makefile @@ -3,7 +3,7 @@ PACKAGE= runtime PROG= du -LIBADD= util +LIBADD= xo util HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1 index 931ca137ee9b..568fded38073 100644 --- a/usr.bin/du/du.1 +++ b/usr.bin/du/du.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 1, 2019 +.Dd April 29, 2024 .Dt DU 1 .Os .Sh NAME @@ -33,6 +33,7 @@ .Nd display disk usage statistics .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl Aclnx .Op Fl H | L | P .Op Fl g | h | k | m @@ -52,6 +53,13 @@ the current directory is displayed. .Pp The options are as follows: .Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_parse_args 3 +for details on command line arguments. .It Fl A Display the apparent size instead of the disk usage. This can be helpful when operating on compressed volumes or sparse files. @@ -216,6 +224,8 @@ Also display a grand total at the end: .Xr df 1 , .Xr chflags 2 , .Xr fts 3 , +.Xr libxo 3 , +.Xr xo_parse_args 3 , .Xr symlink 7 , .Xr quot 8 .Sh STANDARDS diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index cda2470ccca9..96ad7c037dfd 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -48,6 +48,7 @@ #include #include #include +#include #define SI_OPT (CHAR_MAX + 1) @@ -62,7 +63,7 @@ struct ignentry { static int linkchk(FTSENT *); static void usage(void); -static void prthumanval(int64_t); +static void prthumanval(const char *, int64_t); static void ignoreadd(const char *); static void ignoreclean(void); static int ignorep(FTSENT *); @@ -107,6 +108,10 @@ main(int argc, char *argv[]) depth = INT_MAX; SLIST_INIT(&ignores); + argc = xo_parse_args(argc, argv); + if (argc < 0) + exit(EX_USAGE); + while ((ch = getopt_long(argc, argv, "+AB:HI:LPasd:cghklmnrt:x", long_options, NULL)) != -1) switch (ch) { @@ -117,7 +122,7 @@ main(int argc, char *argv[]) errno = 0; cblocksize = atoi(optarg); if (errno == ERANGE || cblocksize <= 0) { - warnx("invalid argument to option B: %s", + xo_warnx("invalid argument to option B: %s", optarg); usage(); } @@ -147,7 +152,7 @@ main(int argc, char *argv[]) errno = 0; depth = atoi(optarg); if (errno == ERANGE || depth < 0) { - warnx("invalid argument to option d: %s", + xo_warnx("invalid argument to option d: %s", optarg); usage(); } @@ -181,7 +186,7 @@ main(int argc, char *argv[]) case 't' : if (expand_number(optarg, &threshold) != 0 || threshold == 0) { - warnx("invalid threshold: %s", optarg); + xo_warnx("invalid threshold: %s", optarg); usage(); } else if (threshold < 0) threshold_sign = -1; @@ -254,6 +259,8 @@ main(int argc, char *argv[]) if ((fts = fts_open(argv, ftsoptions, NULL)) == NULL) err(1, "fts_open"); + xo_open_container("disk-usage-information"); + xo_open_list("paths"); while (errno = 0, (p = fts_read(fts)) != NULL) { switch (p->fts_info) { case FTS_D: /* Ignore. */ @@ -273,15 +280,18 @@ main(int argc, char *argv[]) if (p->fts_level <= depth && threshold <= threshold_sign * howmany(p->fts_bignum * cblocksize, blocksize)) { + xo_open_instance("paths"); if (hflag > 0) { - prthumanval(p->fts_bignum); - (void)printf("\t%s\n", p->fts_path); + prthumanval("{:blocks/%4s}", + p->fts_bignum); + xo_emit("\t{:path/%s}\n", p->fts_path); } else { - (void)printf("%jd\t%s\n", + xo_emit("{:blocks/%jd}\t{:path/%s}\n", (intmax_t)howmany(p->fts_bignum * cblocksize, blocksize), p->fts_path); } + xo_close_instance("paths"); } if (info) { info = 0; @@ -293,7 +303,7 @@ main(int argc, char *argv[]) case FTS_DNR: /* Warn, continue. */ case FTS_ERR: case FTS_NS: - warnx("%s: %s", p->fts_path, strerror(p->fts_errno)); + xo_warnx("%s: %s", p->fts_path, strerror(p->fts_errno)); rval = 1; break; default: @@ -309,36 +319,43 @@ main(int argc, char *argv[]) howmany(p->fts_statp->st_blocks, cblocksize); if (aflag || p->fts_level == 0) { + xo_open_instance("paths"); if (hflag > 0) { - prthumanval(curblocks); - (void)printf("\t%s\n", p->fts_path); + prthumanval("{:blocks/%4s}", curblocks); + xo_emit("\t{:path/%s}\n", p->fts_path); } else { - (void)printf("%jd\t%s\n", + xo_emit("{:blocks/%jd}\t{:path/%s}\n", (intmax_t)howmany(curblocks * cblocksize, blocksize), p->fts_path); } + xo_close_instance("paths"); } p->fts_parent->fts_bignum += curblocks; } savednumber = p->fts_parent->fts_bignum; } + xo_close_list("paths"); if (errno) - err(1, "fts_read"); + xo_err(1, "fts_read"); if (cflag) { if (hflag > 0) { - prthumanval(savednumber); - (void)printf("\ttotal\n"); + prthumanval("{:total-blocks/%4s}\ttotal\n", + savednumber); } else { - (void)printf("%jd\ttotal\n", (intmax_t)howmany( + xo_emit("{:total-blocks/%jd}\ttotal\n", + (intmax_t)howmany( savednumber * cblocksize, blocksize)); } } ignoreclean(); + xo_close_container("disk-usage-information"); + if (xo_finish() < 0) + xo_err(1, "stdout"); exit(rval); } @@ -392,7 +409,7 @@ linkchk(FTSENT *p) if (new_buckets == NULL) { stop_allocating = 1; - warnx("No more memory for tracking hard links"); + xo_warnx("No more memory for tracking hard links"); } else { for (i = 0; i < number_buckets; i++) { while (buckets[i] != NULL) { @@ -458,7 +475,7 @@ linkchk(FTSENT *p) le = malloc(sizeof(struct links_entry)); if (le == NULL) { stop_allocating = 1; - warnx("No more memory for tracking hard links"); + xo_warnx("No more memory for tracking hard links"); return (0); } le->dev = st->st_dev; @@ -474,7 +491,7 @@ linkchk(FTSENT *p) } static void -prthumanval(int64_t bytes) +prthumanval(const char *fmt, int64_t bytes) { char buf[5]; int flags; @@ -488,13 +505,13 @@ prthumanval(int64_t bytes) humanize_number(buf, sizeof(buf), bytes, "", HN_AUTOSCALE, flags); - (void)printf("%4s", buf); + xo_emit(fmt, buf); } static void usage(void) { - (void)fprintf(stderr, + xo_error( "usage: du [-Aclnx] [-H | -L | -P] [-g | -h | -k | -m] " "[-a | -s | -d depth] [-B blocksize] [-I mask] " "[-t threshold] [file ...]\n");