libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implemented block device capacity determination fo Solaris

Browse Source
This commit is contained in:
Thomas Schmitt 2010-06-08 20:04:01 +00:00
parent f96f595486
commit af0b0cf13f
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2010.06.08.174946" #define Cdrskin_timestamP "2010.06.08.200313"

19
libburn/trunk/libburn/sg-libcdio.c
View File

@ -918,7 +918,24 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
return -2; return -2;
*bytes = add_size; *bytes = add_size;
#endif/* Libburn_is_on_freebsD */ #endif /* Libburn_is_on_freebsD */
#ifdef Libburn_is_on_solariS
} else if(S_ISBLK(stbuf.st_mode)) {
int open_mode = O_RDONLY, fd;
fd = open(path, open_mode);
if (fd == -1)
return -2;
*bytes = lseek(fd, 0, SEEK_END);
close(fd);
if (*bytes == -1) {
*bytes = 0;
return 0;
}
#endif /* Libburn_is_on_solariS */
} else if(S_ISREG(stbuf.st_mode)) { } else if(S_ISREG(stbuf.st_mode)) {
add_size = stbuf.st_blocks * (off_t) 512; add_size = stbuf.st_blocks * (off_t) 512;

24
libburn/trunk/libburn/sg-solaris.c
View File

@ -801,30 +801,18 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
if (stat(testpath, &stbuf) == -1) if (stat(testpath, &stbuf) == -1)
return -1; return -1;
#ifdef __linux
/* GNU/Linux specific determination of block device size */
} else if(S_ISBLK(stbuf.st_mode)) { } else if(S_ISBLK(stbuf.st_mode)) {
int open_mode = O_RDONLY, fd, ret; int open_mode = O_RDONLY, fd;
fd = open(path, open_mode); fd = open(path, open_mode);
if (fd == -1) if (fd == -1)
return -2; return -2;
ret = ioctl(fd, BLKGETSIZE, &blocks); *bytes = lseek(fd, 0, SEEK_END);
close(fd); close(fd);
if (ret == -1) if (*bytes == -1) {
return -2; *bytes = 0;
*bytes = ((off_t) blocks) * (off_t) 512; return 0;
}
#endif /* __linux */
/* >>> ioctl to determine capacity of block device
? DKIOCGEXTVTOC , man dkio ?
? DKIOCEXTPARTINFO ,
struct extpart_info.p_length * 512, man dkio ?
*/;
} else if(S_ISREG(stbuf.st_mode)) { } else if(S_ISREG(stbuf.st_mode)) {
add_size = stbuf.st_blocks * (off_t) 512; add_size = stbuf.st_blocks * (off_t) 512;