libudev: device - create db file atomically

[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 921e5346c920f2d10d168c9e97c58d4e196af3be..2380b158a07ece9cb076b3fb82434fd1c9f5b2ff 100644 (file)
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -37,7 +37,8 @@
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static int debug;
 
@@ -172,27 +173,27 @@ static int scsi_cmd_run(struct udev *udev, struct scsi_cmd *cmd, int fd, unsigne
 
 static int cd_capability_compat(struct udev *udev, int fd)
 {
-       int capabilty;
+       int capability;
 
-       capabilty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
-       if (capabilty < 0) {
+       capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
+       if (capability < 0) {
                info(udev, "CDROM_GET_CAPABILITY failed\n");
                return -1;
        }
 
-       if (capabilty & CDC_CD_R)
+       if (capability & CDC_CD_R)
                cd_cd_r = 1;
-       if (capabilty & CDC_CD_RW)
+       if (capability & CDC_CD_RW)
                cd_cd_rw = 1;
-       if (capabilty & CDC_DVD)
+       if (capability & CDC_DVD)
                cd_dvd_rom = 1;
-       if (capabilty & CDC_DVD_R)
+       if (capability & CDC_DVD_R)
                cd_dvd_r = 1;
-       if (capabilty & CDC_DVD_RAM)
+       if (capability & CDC_DVD_RAM)
                cd_dvd_ram = 1;
-       if (capabilty & CDC_MRW)
+       if (capability & CDC_MRW)
                cd_mrw = 1;
-       if (capabilty & CDC_MRW_W)
+       if (capability & CDC_MRW_W)
                cd_mrw_w = 1;
        return 0;
 }
@@ -528,7 +529,7 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                goto exit;
 
-       logging_init("cdrom_id");
+       udev_log_init("cdrom_id");
        udev_set_log_fn(udev, log_fn);
 
        while (1) {
@@ -570,6 +571,7 @@ int main(int argc, char *argv[])
        fd = open(node, O_RDONLY | O_NONBLOCK);
        if (fd < 0) {
                info(udev, "unable to open '%s'\n", node);
+               fprintf(stderr, "unable to open '%s'\n", node);
                rc = 1;
                goto exit;
        }
@@ -581,9 +583,9 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       /* check for media */
-       if (cd_media_compat(udev, fd) < 0)
-               goto print;
+       /* check for media - don't bail if there's no media as we still need to
+         * to read profiles */
+       cd_media_compat(udev, fd);
 
        /* check if drive talks MMC */
        if (cd_inquiry(udev, fd) < 0)
@@ -705,7 +707,7 @@ exit:
        if (fd >= 0)
                close(fd);
        udev_unref(udev);
-       logging_close();
+       udev_log_close();
        return rc;
 }