o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib9: clean up disk size code, add Apple (Anthony Sorace)

Browse source
This commit is contained in:
Russ Cox 2008-07-03 17:45:17 -04:00
parent 5a764c33f5
commit 2c82cd6f52
1 changed files with 50 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

158
src/lib9/_p9dir.c
View file

@ -7,95 +7,65 @@
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
#if defined(__FreeBSD__) #if defined(__APPLE__)
#define _HAVESTGEN
#include <sys/disk.h>
static vlong
disksize(int fd, int dev)
{
u64int bc;
u32int bs;
bs = 0;
bc = 0;
ioctl(fd, DKIOCGETBLOCKSIZE, &bs);
ioctl(fd, DKIOCGETBLOCKCOUNT, &bc);
if(bs >0 && bc > 0)
return bc*bs;
return 0;
}
#elif defined(__FreeBSD__)
#define _HAVESTGEN
#include <sys/disk.h> #include <sys/disk.h>
#include <sys/disklabel.h> #include <sys/disklabel.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif static vlong
disksize(int fd, struct stat *st)
{
off_t mediasize;
#if defined(__OpenBSD__) if(ioctl(fd, DIOCGMEDIASIZE, &mediasize) >= 0)
return mediasize;
return 0;
}
#elif defined(__OpenBSD__)
#define _HAVESTGEN
#include <sys/disklabel.h> #include <sys/disklabel.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#define _HAVEDISKLABEL static vlong
static int diskdev[] = { disksize(int fd, struct stat *st)
151, /* aacd */
116, /* ad */
157, /* ar */
118, /* afd */
133, /* amrd */
13, /* da */
102, /* fla */
109, /* idad */
95, /* md */
131, /* mlxd */
168, /* pst */
147, /* twed */
43, /* vn */
3, /* wd */
87, /* wfd */
4, /* da on FreeBSD 5 */
};
static int
isdisk(struct stat *st)
{ {
int i, dev; struct disklabel lab;
if(!S_ISCHR(st->st_mode)) if(!S_ISCHR(st->st_mode))
return 0; return 0;
dev = major(st->st_rdev); if(ioctl(fd, DIOCGDINFO, &lab) < 0)
for(i=0; i<nelem(diskdev); i++)
if(diskdev[i] == dev)
return 1;
return 0; return 0;
n = minor(st->st_rdev)&7;
if(n >= lab.d_npartitions)
return 0;
return (vlong)lab.d_partitions[n].p_size * lab.d_secsize;
} }
#endif
#if defined(__FreeBSD__) /* maybe OpenBSD too? */ #elif defined(__linux__)
char *diskdev[] = {
"aacd",
"ad",
"ar",
"afd",
"amrd",
"da",
"fla",
"idad",
"md",
"mlxd",
"pst",
"twed",
"vn",
"wd",
"wfd",
"da",
};
static int
isdisk(struct stat *st)
{
char *name;
int i, len;
if(!S_ISCHR(st->st_mode))
return 0;
name = devname(st->st_rdev, S_IFCHR);
for(i=0; i<nelem(diskdev); i++){
len = strlen(diskdev[i]);
if(strncmp(diskdev[i], name, len) == 0 && isdigit((uchar)name[len]))
return 1;
}
return 0;
}
#endif
#if defined(__linux__)
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#undef major #undef major
#define major(dev) ((int)(((dev) >> 8) & 0xff)) #define major(dev) ((int)(((dev) >> 8) & 0xff))
static vlong static vlong
disksize(int fd, int dev) disksize(int fd, struct stat *st)
{ {
u64int u64; u64int u64;
long l; long l;
@ -114,11 +84,13 @@ disksize(int fd, int dev)
return (vlong)geo.heads*geo.sectors*geo.cylinders*512; return (vlong)geo.heads*geo.sectors*geo.cylinders*512;
return 0; return 0;
} }
#define _HAVEDISKSIZE
#endif
#if !defined(__linux__) && !defined(__sun__) #else
#define _HAVESTGEN static vlong
disksize(int fd, struct stat *st)
{
return 0;
}
#endif #endif
int _p9usepwlibrary = 1; int _p9usepwlibrary = 1;
@ -246,44 +218,12 @@ _p9dir(struct stat *lst, struct stat *st, char *name, Dir *d, char **str, char *
d->qid.path = ('c'<<16)|st->st_rdev; d->qid.path = ('c'<<16)|st->st_rdev;
} }
/* fetch real size for disks */ /* fetch real size for disks */
#ifdef _HAVEDISKSIZE if(S_ISBLK(st->st_mode) || S_ISCHR(st->st_mode))
if(S_ISBLK(st->st_mode) && (fd = open(name, O_RDONLY)) >= 0){
d->length = disksize(fd, major(st->st_dev));
close(fd);
}
#endif
#if defined(DIOCGMEDIASIZE)
if(isdisk(st)){
int fd;
off_t mediasize;
if((fd = open(name, O_RDONLY)) >= 0){ if((fd = open(name, O_RDONLY)) >= 0){
if(ioctl(fd, DIOCGMEDIASIZE, &mediasize) >= 0) d->length = disksize(fd, st);
d->length = mediasize;
close(fd); close(fd);
} }
} }
#elif defined(_HAVEDISKLABEL)
if(isdisk(st)){
int fd, n;
struct disklabel lab;
if((fd = open(name, O_RDONLY)) < 0)
goto nosize;
if(ioctl(fd, DIOCGDINFO, &lab) < 0)
goto nosize;
n = minor(st->st_rdev)&7;
if(n >= lab.d_npartitions)
goto nosize;
d->length = (vlong)(lab.d_partitions[n].p_size) * lab.d_secsize;
nosize:
if(fd >= 0)
close(fd);
}
#endif
}
return sz; return sz;
} }