d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stat(1): Do not pass S_IFBLK to devname unconditionally

Browse Source 
PR:	269190
Reviewed by:	kib
MFC after:	1 week
This commit is contained in:
Alexander Naumochkin 2023-01-28 15:31:39 +02:00 committed by Konstantin Belousov
parent 0311fe403d
commit 050e4bca94
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/stat/stat.c
View File

@ -640,14 +640,9 @@ format1(const struct stat *st,
small = (sizeof(st->st_dev) == 4);
data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev;
#if HAVE_DEVNAME
sdata = (what == SHOW_st_dev) ?
devname(st->st_dev, S_IFBLK) :
devname(st->st_rdev,
S_ISCHR(st->st_mode) ? S_IFCHR :
S_ISBLK(st->st_mode) ? S_IFBLK :
0U);
if (sdata == NULL)
sdata = "???";
sdata = devname(what == SHOW_st_dev ? st->st_dev :
st->st_rdev, S_ISCHR(st->st_mode) ? S_IFCHR :
(S_ISBLK(st->st_mode) ? S_IFBLK : 0));
#endif /* HAVE_DEVNAME */
if (hilo == HIGH_PIECE) {
data = major(data);