diff options
| author | Alexander Naumochkin <alexander.naumochkin@gmail.com> | 2023-01-28 13:31:39 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2023-01-28 18:04:43 +0000 |
| commit | 050e4bca94e907c046e9ed63f90b5dd0e49fb405 (patch) | |
| tree | d8d6eba3d55f427a51f8e45085a3823ec5950f9b | |
| parent | 0311fe403d35f6241fa94104c4b92c9d73214cbc (diff) | |
| -rw-r--r-- | usr.bin/stat/stat.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 9d94399a6333..dca7363f4fcc 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -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); |