system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-08 20:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

nvmecontrol: Allow optional /dev/ for device names

Browse Source 
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
This commit is contained in:
Warner Losh 2024-04-28 11:01:24 -06:00
parent c40e0bff72
commit b12cae88cf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/nvmecontrol/nvmecontrol.8
View File

@ -33,7 +33,7 @@
.\"
.\" Author: Jim Harris <jimharris@FreeBSD.org>
.\"
.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

7
sbin/nvmecontrol/nvmecontrol.c
View File

@ -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) {