diff options
author | Elliott Hughes <enh@google.com> | 2019-11-22 12:48:35 -0800 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2019-11-23 09:57:24 -0600 |
commit | e028208e53fb94c7c6c2873a116f680e234784ec (patch) | |
tree | 98ef0fe2cbcf392fe28847f9596aa8f6a41592a1 /lib/portability.c | |
parent | 41dd4878451806ff3b27b9739fc77c0d34037883 (diff) | |
download | toybox-e028208e53fb94c7c6c2873a116f680e234784ec.tar.gz |
Fix dev_minor()/dev_major()/dev_makedev() for Mac.
Major/minor device encoding is not portable. No two BSDs agree with
each other, and Darwin is different again.
Everyone does agree on having major()/minor()/makedev() macros, but
they disagree whether they should be in <sys/types.h> (the BSDs
including Darwin, and old versions of glibc) or <sys/sysmacros.h>
(glibc >= 2.26 and bionic).
This fixes `ls -l /dev/zero` and `stat /dev/zero` on Mac.
Diffstat (limited to 'lib/portability.c')
-rw-r--r-- | lib/portability.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/lib/portability.c b/lib/portability.c index 0b5677cc..ae862c97 100644 --- a/lib/portability.c +++ b/lib/portability.c @@ -515,3 +515,36 @@ char *num_to_sig(int sig) return NULL; } + +int dev_minor(int dev) +{ +#if defined(__linux__) + return ((dev&0xfff00000)>>12)|(dev&0xff); +#elif defined(__APPLE__) + return dev&0xffffff; +#else +#error +#endif +} + +int dev_major(int dev) +{ +#if defined(__linux__) + return (dev&0xfff00)>>8; +#elif defined(__APPLE__) + return (dev>>24)&0xff; +#else +#error +#endif +} + +int dev_makedev(int major, int minor) +{ +#if defined(__linux__) + return (minor&0xff)|((major&0xfff)<<8)|((minor&0xfff00)<<12); +#elif defined(__APPLE__) + return (minor&0xffffff)|((major&0xff)<<24); +#else +#error +#endif +} |