From 7ca5dc4232b9ac5ee5cd25c8b5b33a58904cd251 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 2 Mar 2016 11:52:38 -0600 Subject: For years the man pages have said to #include to get major/minor/makedev, but glibc has vowed to break existing programs (https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html) and replace it with _another_ non-standard header (not in posix or lsb), so let's just add functions to lib/ that do the transform ourselves. --- toys/other/mountpoint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'toys/other/mountpoint.c') diff --git a/toys/other/mountpoint.c b/toys/other/mountpoint.c index ce1d23cd..98e1d309 100644 --- a/toys/other/mountpoint.c +++ b/toys/other/mountpoint.c @@ -37,7 +37,8 @@ void mountpoint_main(void) if (toys.optflags & FLAG_x) { if (S_ISBLK(st1.st_mode)) { - if (!quiet) printf("%u:%u\n", major(st1.st_rdev), minor(st1.st_rdev)); + if (!quiet) + printf("%u:%u\n", dev_major(st1.st_rdev), dev_minor(st1.st_rdev)); return; } @@ -57,7 +58,7 @@ void mountpoint_main(void) // absence of a spec I guess that's the expected behavior? toys.exitval = !(st1.st_dev != st2.st_dev || st1.st_ino == st2.st_ino); if (toys.optflags & FLAG_d) - printf("%u:%u\n", major(st1.st_dev), minor(st1.st_dev)); + printf("%u:%u\n", dev_major(st1.st_dev), dev_minor(st1.st_dev)); else if (!quiet) printf("%s is %sa mountpoint\n", *toys.optargs, toys.exitval ? "not " : ""); } -- cgit v1.2.3