From nobody Thu May 1 19:51:23 2025 X-Original-To: dev-commits-src-branches@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 4ZpPnS3NjTz5vfH9; Thu, 01 May 2025 19:51:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpPnR6l7tz46C9; Thu, 01 May 2025 19:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129084; 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=5hlZbbgv8TO0JX76XMmt/lwoWrzjHjtnkpywxQ3eBi0=; b=iGMgDMeAhgr05tg9bL0rXNqyY9Szw0StgNWEaBd87e8JYLEis8qVqkA2BkFwM49qqS9/Mq Na2i9N/u1aQwYj4Wse3+fswLSjlRBQy79gFFjOPiP7ly9BYB2aymG9A2Ld0yNDD/jH9MPf PXHA9izYsQFUrOdJ5wRlEU34kdX10CiB+8f8JG9F3NyGhXLfvl38Wbnk+l0lzTRvguWd2g g/Sbx1ScYi4pgmGEHatfRk5A3p8pA+BlFSywIoZTxhgHWyQEQEMKUWuMnzfzwjth0di+xd GUsa8q3seEjuYXXV5KDT3TEIJDSxm69QONM8XMRM5PdlL142qxBKNl8KRrf67A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129084; 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=5hlZbbgv8TO0JX76XMmt/lwoWrzjHjtnkpywxQ3eBi0=; b=xNby4r3SX/cgIJxmhT/gr5JlBNdzYLz3xa+/2VeFE74bo0qnLYDd1i+RLWvcG+j5R/Hcm8 rk0YY+RjzGST2JQhwMLX7EcuU+O0VxGbJQmC5qjqGPbOfk8V6Inzf8VDdB36xG591yPgEi eZX+K6wRT5Y0IuRjIjddFGsWqXeRdVZT9dxFV90wx+MVfE+grspylttd8kt7PiiUf7/xqP p+gdxo2FN5cs8bZXzB9OlYnXO+0B2O+NBDMNOKess7oDw8jswuG7MFxAkE4ijIRa4/tIxR XtuivfPIY92mIiXC4Jwm71sFZ36q14y1ruDPccZJttW4NOf8OO8yE/nYIwET9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746129084; a=rsa-sha256; cv=none; b=oJYYdH523TeZ+pG3EWhTVlwO2V9gvqKdwyAp6JVAZN9Mm62ldXVCGcP0JLM/NVSQIU3QqR 3t0r0qJT+FnRnegx2Q/+kFywmzsguJGKrHRJUSmEsCWncXxVuJTZX77djIJGcBc/o4/ee8 OJKprFWIoF6aKcmsoU7NAf4hWgF1btqwDM/l1tmUs84t3Camcqy4iN0Tu/nAwPQeD6NtUu ZNi8OUS2Z0nAMjUklW1fGsiOjWEvJgRXOkB/WxhGT3ekNiiltlHWC5bjitrsJfoYkFoU3M eTm+rdw9KNSVvQ8hbRpSOr45cz8yiZb+G5cqOriTEPN4yKb72jVRzXugEy+o/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpPnR6CmqzjHg; Thu, 01 May 2025 19:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 541JpNsl067037; Thu, 1 May 2025 19:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541JpNlH067034; Thu, 1 May 2025 19:51:23 GMT (envelope-from git) Date: Thu, 1 May 2025 19:51:23 GMT Message-Id: <202505011951.541JpNlH067034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: ac6a9fed6cd1 - stable/14 - ps(1): Complete libxo transition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac6a9fed6cd117fb504823056b8b8226f1acdf45 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6a9fed6cd117fb504823056b8b8226f1acdf45 commit ac6a9fed6cd117fb504823056b8b8226f1acdf45 Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:06:59 +0000 Commit: Olivier Certner CommitDate: 2025-05-01 19:35:07 +0000 ps(1): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41422 (cherry picked from commit e17a2944a6e08478b9c073ba62c46f6714af16a2) --- bin/ps/keyword.c | 14 +++++++------- bin/ps/print.c | 1 - bin/ps/ps.c | 13 +++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 7996bc000e03..4d93cd152f43 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -42,7 +42,6 @@ static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #include #include -#include #include #include #include @@ -256,7 +255,8 @@ showkey(void) } xo_emit("\n"); xo_close_list("key"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); } void @@ -297,7 +297,7 @@ parsefmt(const char *p, int user) continue; } if ((vent = malloc(sizeof(struct varent))) == NULL) - errx(1, "malloc failed"); + xo_errx(1, "malloc failed"); vent->header = v->header; if (hp) { hp = strdup(hp); @@ -306,13 +306,13 @@ parsefmt(const char *p, int user) } vent->var = malloc(sizeof(*vent->var)); if (vent->var == NULL) - errx(1, "malloc failed"); + xo_errx(1, "malloc failed"); memcpy(vent->var, v, sizeof(*vent->var)); STAILQ_INSERT_TAIL(&varlist, vent, next_ve); } free(tempstr1); if (STAILQ_EMPTY(&varlist)) { - warnx("no valid keywords; valid keywords:"); + xo_warnx("no valid keywords; valid keywords:"); showkey(); exit(1); } @@ -351,7 +351,7 @@ findvar(char *p, int user, char **header) rflen = strlen(v->alias) + strlen(hp) + 2; realfmt = malloc(rflen); if (realfmt == NULL) - errx(1, "malloc failed"); + xo_errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); free(realfmt); @@ -359,7 +359,7 @@ findvar(char *p, int user, char **header) return ((VAR *)NULL); } if (!v) { - warnx("%s: keyword not found", p); + xo_warnx("%s: keyword not found", p); eval = 1; } if (header) diff --git a/bin/ps/print.c b/bin/ps/print.c index 8972cb14758b..1ed6afe995c5 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -47,7 +47,6 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #include #include -#include #include #include #include diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 897b4ccd9a92..98d95eb08aa7 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -59,7 +59,6 @@ static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #include #include -#include #include #include #include @@ -670,7 +669,8 @@ main(int argc, char *argv[]) if (nkept == 0) { printheader(); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); exit(1); } @@ -755,7 +755,8 @@ main(int argc, char *argv[]) } xo_close_list("process"); xo_close_container("process-information"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); free_list(&gidlist); free_list(&jidlist); @@ -825,14 +826,14 @@ addelem_jid(struct listinfo *inf, const char *elem) int tempid; if (*elem == '\0') { - warnx("Invalid (zero-length) jail id"); + xo_warnx("Invalid (zero-length) jail id"); optfatal = 1; return (0); /* Do not add this value. */ } tempid = jail_getid(elem); if (tempid < 0) { - warnx("Invalid %s: %s", inf->lname, elem); + xo_warnx("Invalid %s: %s", inf->lname, elem); optfatal = 1; return (0); } @@ -1493,7 +1494,7 @@ usage(void) { #define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]" - (void)xo_error("%s\n%s\n%s\n%s\n%s\n", + xo_error("%s\n%s\n%s\n%s\n%s\n", "usage: ps [--libxo] " SINGLE_OPTS " [-O fmt | -o fmt]", " [-G gid[,gid...]] [-J jid[,jid...]] [-M core] [-N system]", " [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]",