From nobody Thu May 2 21:52:28 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 4VVnj868xvz5K6h7; Thu, 2 May 2024 21:52:28 +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 4VVnj85jxdz49b1; Thu, 2 May 2024 21:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714686748; 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=21WURa7Y3ijg8nqvcoPMwrqFmRERpLdWvkU9muhVm28=; b=oQW5NdPWEvw1HvqvKlQGAP8gjYcAL8bxdtoC5YqzoE2buBKuMDIP+ebh2zfptXSpN2cXQX Lv0bRQvcHm/gQFO6oMc9sCot079nqcDy6KWV8RqIluvmWqdl7rgis69Y4ReFJfpe526Wlw dmmmvKhKXGO9PIPmwDd4dGtdUGS3eT8EsecEK9pIUf/ZNqJGERpPBexMC3KnxsjiElW0EQ baBAMhgAXYaOtbdKPpq8DR7fhQkuilGwiLXyV+n40Kts/9LgoAVJt1CatMm1LGpK+Z65AT VAxN+wPyNaAsOuyndwbzK2zoiiYxXGqVFzf3jgcAFn+YvaNHpE/nz9wxKJfZuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714686748; a=rsa-sha256; cv=none; b=iiHPWblbrBbBmIQYWghYhsGJ53Q882lCVf1Mf4ydzFaCdk8twVb1eYLzAL/+lEPB6GteMo F0Yx7S1njC7EvPDNOk1qHL6lB+y26/8UYnw34VNtuoofe6ORq4+XHjxL4P5/PPRYUK1gzb F4fdrn2lFtQdiiwxx5CL2LU8J+GLDxyjtx3lBLWPJP7/FuKKNJgZcOjPysXiXOVrW3C5Lh wIqo+wB5NERZ2S1HyraJmYhvuLv6NFzkgWxbiI0my7hl+wgy8v4fo+1bSixI/MeGWrt0H4 Vpp8TTI6WNLWqi3G/jTlW+NzHP3rRoA0Z/4Isc9e3Wwp81sQT8JCKFzW6sUdiw== 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=1714686748; 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=21WURa7Y3ijg8nqvcoPMwrqFmRERpLdWvkU9muhVm28=; b=Q/VBLuZQos1QR7y+zFGXjUNB382pRe1xw17IKESxhPTkLw7plT1b7CVRQzd7V45YVf6Zjy TFz53W/CXauh6P1UoZJo77a4NwQd0OhIykaIxdoghBuTqIBPqM/Enqy1R1YyOvREMUuBao CLT3hZDIar0Ttw2EBRV+Eae00XoQOjL1ULLGuYo/Ac2F/R2EUpIzJnOA5D2ODFQxSe2gAG QzSZhmW+WkfBKqsz5VRvsjYargzFOFtE+B2FzkowNpgmZDqgCPJCS0itdih6le838wMmh+ YbyQdm5WDZWhDUolpAojA7rpik0giJGYszxmgPn1YT1NS+3j/GJ42vPk55X+KA== 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 4VVnj84VBpzKbj; Thu, 2 May 2024 21:52:28 +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 442LqS3c041109; Thu, 2 May 2024 21:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442LqSoJ041106; Thu, 2 May 2024 21:52:28 GMT (envelope-from git) Date: Thu, 2 May 2024 21:52:28 GMT Message-Id: <202405022152.442LqSoJ041106@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: b12cae88cfb6 - main - nvmecontrol: Allow optional /dev/ for device names 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: b12cae88cfb6286bc85a47b36ddd84f52b5c38ca Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b12cae88cfb6286bc85a47b36ddd84f52b5c38ca commit b12cae88cfb6286bc85a47b36ddd84f52b5c38ca Author: Warner Losh AuthorDate: 2024-04-28 17:01:24 +0000 Commit: Warner Losh CommitDate: 2024-05-02 21:52:20 +0000 nvmecontrol: Allow optional /dev/ for device names nvmecontrol operates on devices. Allow a user to specify the /dev/ if they want. Any device that starts with / will be treated as if it was a full path for maximum flexbility. Sponsored by: Netflix --- sbin/nvmecontrol/nvmecontrol.8 | 4 ++-- sbin/nvmecontrol/nvmecontrol.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index b5a85b1ab9f5..1310184ac309 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -33,7 +33,7 @@ .\" .\" Author: Jim Harris .\" -.Dd April 17, 2024 +.Dd May 3, 2024 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -687,7 +687,7 @@ or .Pa nvdZ . The leading .Pa /dev/ -is omitted. +may be omitted. Where .Aq Ar device-id is required, you can use either the diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c index 10623799d705..8ad9703de9f6 100644 --- a/sbin/nvmecontrol/nvmecontrol.c +++ b/sbin/nvmecontrol/nvmecontrol.c @@ -145,9 +145,12 @@ read_namespace_data(int fd, uint32_t nsid, struct nvme_namespace_data *nsdata) int open_dev(const char *str, int *fd, int write, int exit_on_error) { - char full_path[64]; + char full_path[MAXPATHLEN]; - snprintf(full_path, sizeof(full_path), _PATH_DEV"%s", str); + if (str[0] == '/') /* Full path */ + strlcpy(full_path, str, sizeof(full_path)); + else /* Add /dev/ */ + snprintf(full_path, sizeof(full_path), _PATH_DEV"%s", str); *fd = open(full_path, write ? O_RDWR : O_RDONLY); if (*fd < 0) { if (exit_on_error) {