vol_id: make the --offset= argument optional

[elogind.git] / extras / cdrom_id / cdrom_id.c

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index b88f5b4b1e0748f9729ce002d8ccd0d88d74206a..9e274718631e38ac0b431ede4578be792fbac1b4 100644 (file)
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -37,7 +37,8 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
-#include "../../udev.h"
+
+#include "../../udev/udev.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
@@ -122,10 +123,11 @@ static unsigned int cd_media_mrw;
 static unsigned int cd_media_mrw_w;
 
 static const char *cd_media_state;
-static unsigned int cd_media_has_audio;
 static unsigned int cd_media_session_next;
 static unsigned int cd_media_session_count;
 static unsigned int cd_media_track_count;
+static unsigned int cd_media_track_count_data;
+static unsigned int cd_media_track_count_audio;
 static unsigned long long int cd_media_session_last_offset;
 
 #define ERRCODE(s)     ((((s)[2] & 0x0F) << 16) | ((s)[12] << 8) | ((s)[13]))
@@ -469,10 +471,12 @@ static int cd_media_toc(int fd)
        info("READ TOC: len: %d\n", len);
        if (len > sizeof(toc))
                return -1;
+       if (len < 2)
+               return -1;
 
-       /* check if we have a data track */
-       info("ctl %02x (0x04 is data/audio)\n", header[5]);
-       cd_media_has_audio = (header[5] & 0x04) == 0;
+       /* 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 */
@@ -487,9 +491,18 @@ static int cd_media_toc(int fd)
 
        for (p = toc+4, i = 4; i < len-8; i += 8, p += 8) {
                unsigned int block;
+               unsigned int is_data_track;
+
+               is_data_track = (p[1] & 0x04) != 0;
 
                block = p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7];
-               info("track %u starts at block %u\n", p[2], block);
+               info("track=%u info=0x%x(%s) start_block=%u\n",
+                    p[2], p[1] & 0x0f, is_data_track ? "data":"audio", block);
+
+               if (is_data_track)
+                       cd_media_track_count_data++;
+               else
+                       cd_media_track_count_audio++;
        }
 
        scsi_cmd_set(&sc, 0, 0x43);
@@ -538,8 +551,9 @@ int main(int argc, char *argv[])
                        break;
                case 'h':
                        printf("Usage: cdrom_id [options] <device>\n"
-                           " --export        export key/value pairs\n"
-                           " --help\n\n");
+                              "  --export        export key/value pairs\n"
+                              "  --debug         debug to stderr\n"
+                              "  --help          print this help text\n\n");
                        goto exit;
                default:
                        rc = 1;
@@ -673,15 +687,17 @@ print:
 
        if (cd_media_state != NULL)
                printf("ID_CDROM_MEDIA_STATE=%s\n", cd_media_state);
-       if (cd_media_has_audio)
-               printf("ID_CDROM_MEDIA_HAS_AUDIO=1\n");
        if (cd_media_session_next > 0)
                printf("ID_CDROM_MEDIA_SESSION_NEXT=%d\n", cd_media_session_next);
        if (cd_media_session_count > 0)
                printf("ID_CDROM_MEDIA_SESSION_COUNT=%d\n", cd_media_session_count);
        if (cd_media_track_count > 0)
                printf("ID_CDROM_MEDIA_TRACK_COUNT=%d\n", cd_media_track_count);
-       if (cd_media_session_last_offset)
+       if (cd_media_track_count_audio > 0)
+               printf("ID_CDROM_MEDIA_TRACK_COUNT_AUDIO=%d\n", cd_media_track_count_audio);
+       if (cd_media_track_count_data > 0)
+               printf("ID_CDROM_MEDIA_TRACK_COUNT_DATA=%d\n", cd_media_track_count_data);
+       if (cd_media_session_last_offset > 0)
                printf("ID_CDROM_MEDIA_SESSION_LAST_OFFSET=%llu\n", cd_media_session_last_offset);
 exit:
        if (fd >= 0)