picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cdrom_id: skip media tests if CDROM_DRIVE_STATUS != CDS_DISC_OK

This commit is contained in:
Kay Sievers 2009-04-23 15:04:16 +02:00
parent 8c3ae78546
commit d6f0b22d57
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extras/cdrom_id/cdrom_id.c
View File

@ -197,6 +197,16 @@ static int cd_capability_compat(struct udev *udev, int fd)
return 0;
}
static int cd_media_compat(struct udev *udev, int fd)
{
if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {
info(udev, "CDROM_DRIVE_STATUS != CDS_DISC_OK\n");
return -1;
}
cd_media = 1;
return 0;
}
static int cd_inquiry(struct udev *udev, int fd) {
struct scsi_cmd sc;
unsigned char inq[128];
@ -569,7 +579,11 @@ int main(int argc, char *argv[])
goto exit;
}
/* check drive */
/* check for media */
if (cd_media_compat(udev, fd) < 0)
goto print;
/* check if drive talks MMC */
if (cd_inquiry(udev, fd) < 0)
goto print;