imrcpan/freebsd
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-10-28 11:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
PR:	269190

(cherry picked from commit 050e4bca94)
This commit is contained in:
Alexander Naumochkin authored and Konstantin Belousov committed 2023-02-03 02:26:12 +02:00
1 parent dfd1dea884
commit 75aa61400c
1 file changed
+3 -8
Download Patch File Download Diff File Expand all files Collapse all files
usr.bin/stat/stat.c
+3 -8
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);