chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c0644c
)
cdrom_id: fix recognition of blank media
author
Kay Sievers
<kay.sievers@vrfy.org>
Thu, 12 Jun 2008 05:20:14 +0000
(07:20 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Thu, 12 Jun 2008 05:20:14 +0000
(07:20 +0200)
Thanks to David!
extras/cdrom_id/cdrom_id.c
patch
|
blob
|
history
diff --git
a/extras/cdrom_id/cdrom_id.c
b/extras/cdrom_id/cdrom_id.c
index 6d3326bd311851dfca1104fe68e346ba33f9d317..a1135665a9c1092db1788bfa4c0a0206406ce858 100644
(file)
--- a/
extras/cdrom_id/cdrom_id.c
+++ b/
extras/cdrom_id/cdrom_id.c
@@
-470,9
+470,13
@@
static int cd_media_toc(int fd)
info("READ TOC: len: %d\n", len);
if (len > sizeof(toc))
return -1;
info("READ TOC: len: %d\n", len);
if (len > sizeof(toc))
return -1;
- if (len <
8
)
+ if (len <
2
)
return -1;
return -1;
+ /* empty media has no tracks */
+ if (len < 8)
+ return 0;
+
scsi_cmd_set(&sc, 0, 0x43);
scsi_cmd_set(&sc, 6, header[2]); /* First Track/Session Number */
scsi_cmd_set(&sc, 7, len >> 8);
scsi_cmd_set(&sc, 0, 0x43);
scsi_cmd_set(&sc, 6, header[2]); /* First Track/Session Number */
scsi_cmd_set(&sc, 7, len >> 8);