Page MenuHomeFreeBSD
Files F156938181

D56565.id176230.diff
No OneTemporary
Actions

D56565.id176230.diff
View Options

diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -650,6 +650,7 @@
struct timespec ts;
struct tm *tm;
int l, small, formats;
+ mode_t dtype;
tsp = NULL;
formats = 0;
@@ -665,9 +666,16 @@
small = (sizeof(st->st_dev) == 4);
data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev;
#if HAVE_DEVNAME
- 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));
+ switch (what) {
+ case SHOW_st_dev:
+ dtype = S_IFCHR;
+ break;
+ case SHOW_st_rdev:
+ dtype = st->st_mode & (S_IFCHR | S_IFBLK);
+ break;
+ }
+
+ sdata = devname(data, dtype);
#endif /* HAVE_DEVNAME */
if (hilo == HIGH_PIECE) {
data = major(data);
diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh
--- a/usr.bin/stat/tests/stat_test.sh
+++ b/usr.bin/stat/tests/stat_test.sh
@@ -301,6 +301,38 @@
done
}
+atf_test_case devname cleanup
+devname_head()
+{
+ atf_set "descr" "Verify that %Sd outputs a device name"
+}
+devname_body()
+{
+ local chkpath devname devpath
+
+ chkpath="mnt"
+
+ atf_check -o save:dev mdconfig -t malloc -s 16M
+ read devname < dev
+ devpath="/dev/$devname"
+ atf_check -o not-empty newfs "$devpath"
+
+ atf_check mkdir "$chkpath"
+ atf_check mount "$devpath" "$chkpath"
+
+ atf_check -o inline:"$devname\n" stat -f '%Sd' "$chkpath"
+ atf_check -o inline:"$devname\n" stat -f '%Sr' "$devpath"
+}
+devname_cleanup()
+{
+ if [ -d mnt ]; then
+ umount mnt || true
+ fi
+ if [ -f dev ]; then
+ mdconfig -d -u $(cat dev) || true
+ fi
+}
+
atf_init_test_cases()
{
atf_add_test_case F_flag
@@ -315,4 +347,5 @@
atf_add_test_case s_flag
atf_add_test_case t_flag
atf_add_test_case x_flag
+ atf_add_test_case devname
}

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 12:12 PM (59 m, 54 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33247641
Default Alt Text
D56565.id176230.diff (1 KB)

Event Timeline