tFix overflow in old Linux file size. - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit a3e9d8935f71d308cc879e35cc7f8223996c61ca
DIR parent a32765e337d2657f09630ebf7bd71d9623269546
HTML Author: rsc <devnull@localhost>
Date: Wed, 10 Aug 2005 17:16:38 +0000
Fix overflow in old Linux file size.
Diffstat:
M src/lib9/_p9dir.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
DIR diff --git a/src/lib9/_p9dir.c b/src/lib9/_p9dir.c
t@@ -47,6 +47,8 @@ isdisk(struct stat *st)
#include <linux/hdreg.h>
#include <linux/fs.h>
#include <sys/ioctl.h>
+#undef major
+#define major(dev) ((int)(((dev) >> 8) & 0xff))
static vlong
disksize(int fd, int dev)
{
t@@ -62,7 +64,7 @@ disksize(int fd, int dev)
return u64;
#endif
if(ioctl(fd, BLKGETSIZE, &l) >= 0)
- return l*512;
+ return (vlong)l*512;
if(ioctl(fd, HDIO_GETGEO, &geo) >= 0)
return (vlong)geo.heads*geo.sectors*geo.cylinders*512;
return 0;