From owner-dev-commits-src-main@freebsd.org Mon Jul 19 14:44:35 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D85C65852C;
Mon, 19 Jul 2021 14:44:35 +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 4GT4PH0S8vz3N3v;
Mon, 19 Jul 2021 14:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 E613018EBD;
Mon, 19 Jul 2021 14:44:34 +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 16JEiY5Y010390;
Mon, 19 Jul 2021 14:44:34 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16JEiYPJ010389;
Mon, 19 Jul 2021 14:44:34 GMT (envelope-from git)
Date: Mon, 19 Jul 2021 14:44:34 GMT
Message-Id: <202107191444.16JEiYPJ010389@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alex Richardson <arichardson@FreeBSD.org>
Subject: git: 2423585b1de5 - main - bin/ps: Avoid function name conflict with
libc uname()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: arichardson
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 2423585b1de50dd2daea8478318e94ff80e0e6ec
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jul 2021 14:44:35 -0000
The branch main has been updated by arichardson:
URL: https://cgit.FreeBSD.org/src/commit/?id=2423585b1de50dd2daea8478318e94ff80e0e6ec
commit 2423585b1de50dd2daea8478318e94ff80e0e6ec
Author: Alex Richardson <arichardson@FreeBSD.org>
AuthorDate: 2021-07-19 14:03:38 +0000
Commit: Alex Richardson <arichardson@FreeBSD.org>
CommitDate: 2021-07-19 14:04:09 +0000
bin/ps: Avoid function name conflict with libc uname()
This prevents ps from being built with address sanitizer instrumentation.
Reviewed By: trasz
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D31048
---
bin/ps/extern.h | 2 +-
bin/ps/keyword.c | 2 +-
bin/ps/print.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 723d7fcb85dd..ea4362eeadd9 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -86,7 +86,7 @@ char *tdev(KINFO *, VARENT *);
char *tdnam(KINFO *, VARENT *);
char *tname(KINFO *, VARENT *);
char *ucomm(KINFO *, VARENT *);
-char *uname(KINFO *, VARENT *);
+char *username(KINFO *, VARENT *);
char *upr(KINFO *, VARENT *);
char *usertime(KINFO *, VARENT *);
char *vsize(KINFO *, VARENT *);
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 2a8382a2273e..e78cf984e455 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -222,7 +222,7 @@ static VAR var[] = {
{"upr", "UPR", NULL, "user-priority", 0, upr, 0, CHAR, NULL, 0},
{"uprocp", "UPROCP", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
KPTR, "lx", 0},
- {"user", "USER", NULL, "user", LJUST, uname, 0, CHAR, NULL, 0},
+ {"user", "USER", NULL, "user", LJUST, username, 0, CHAR, NULL, 0},
{"usertime", "USERTIME", NULL, "user-time", USER, usertime, 0, CHAR,
NULL, 0},
{"usrpri", "", "upr", NULL, 0, NULL, 0, CHAR, NULL, 0},
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 3d3a543c8a5d..2b61c6b0a15a 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -311,7 +311,7 @@ upr(KINFO *k, VARENT *ve __unused)
#undef scalepri
char *
-uname(KINFO *k, VARENT *ve __unused)
+username(KINFO *k, VARENT *ve __unused)
{
return (strdup(user_from_uid(k->ki_p->ki_uid, 0)));