chiark / gitweb /
libudev: export udev_util_encode_string()
[elogind.git] / extras / ata_id / ata_id.c
index 9579db310593b5608493efd003808800f7265d8e..e38a7d1aa522b94492916009945d589ffa148675 100644 (file)
 /*
  * ata_id - reads product/serial number from ATA drives
  *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2009 Lennart Poettering <lennart@poettering.net>
+ * Copyright (C) 2009-2010 David Zeuthen <zeuthen@gmail.com>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *     Lesser General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <assert.h>
+#include <string.h>
 #include <errno.h>
+#include <getopt.h>
+#include <scsi/scsi.h>
+#include <scsi/sg.h>
+#include <scsi/scsi_ioctl.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <linux/types.h>
 #include <linux/hdreg.h>
+#include <linux/fs.h>
+#include <linux/cdrom.h>
+#include <linux/bsg.h>
+#include <arpa/inet.h>
+
+#include "libudev.h"
+#include "libudev-private.h"
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#define COMMAND_TIMEOUT_MSEC (30 * 1000)
 
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
+static int disk_scsi_inquiry_command(int      fd,
+                                    void    *buf,
+                                    size_t   buf_len)
 {
-       va_list args;
-       static int udev_log = -1;
+       struct sg_io_v4 io_v4;
+       uint8_t cdb[12];
+       uint8_t sense[32];
+       int ret;
 
-       if (udev_log == -1) {
-               const char *value;
+       /*
+        * INQUIRY, see SPC-4 section 6.4
+        */
+       memset(cdb, 0, sizeof(cdb));
+       cdb[0] = 0x12;                   /* OPERATION CODE: INQUIRY */
+       cdb[3] = (buf_len >> 8);         /* ALLOCATION LENGTH */
+       cdb[4] = (buf_len & 0xff);
 
-               value = getenv("UDEV_LOG");
-               if (value)
-                       udev_log = log_priority(value);
-               else
-                       udev_log = LOG_ERR;
+       memset(sense, 0, sizeof(sense));
+
+       memset(&io_v4, 0, sizeof(struct sg_io_v4));
+       io_v4.guard = 'Q';
+       io_v4.protocol = BSG_PROTOCOL_SCSI;
+       io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+       io_v4.request_len = sizeof (cdb);
+       io_v4.request = (uintptr_t) cdb;
+       io_v4.max_response_len = sizeof (sense);
+       io_v4.response = (uintptr_t) sense;
+       io_v4.din_xfer_len = buf_len;
+       io_v4.din_xferp = (uintptr_t) buf;
+       io_v4.timeout = COMMAND_TIMEOUT_MSEC;
+
+       ret = ioctl(fd, SG_IO, &io_v4);
+       if (ret != 0) {
+               /* could be that the driver doesn't do version 4, try version 3 */
+               if (errno == EINVAL) {
+                       struct sg_io_hdr io_hdr;
+
+                       memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                       io_hdr.interface_id = 'S';
+                       io_hdr.cmdp = (unsigned char*) cdb;
+                       io_hdr.cmd_len = sizeof (cdb);
+                       io_hdr.dxferp = buf;
+                       io_hdr.dxfer_len = buf_len;
+                       io_hdr.sbp = sense;
+                       io_hdr.mx_sb_len = sizeof (sense);
+                       io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                       io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
+
+                       ret = ioctl(fd, SG_IO, &io_hdr);
+                       if (ret != 0)
+                               goto out;
+
+                       /* even if the ioctl succeeds, we need to check the return value */
+                       if (!(io_hdr.status == 0 &&
+                             io_hdr.host_status == 0 &&
+                             io_hdr.driver_status == 0)) {
+                               errno = EIO;
+                               ret = -1;
+                               goto out;
+                       }
+               } else {
+                       goto out;
+               }
        }
 
-       if (priority > udev_log)
-               return;
+       /* even if the ioctl succeeds, we need to check the return value */
+       if (!(io_v4.device_status == 0 &&
+             io_v4.transport_status == 0 &&
+             io_v4.driver_status == 0)) {
+               errno = EIO;
+               ret = -1;
+               goto out;
+       }
 
-       va_start(args, format);
-       vsyslog(priority, format, args);
-       va_end(args);
+ out:
+       return ret;
+}
+
+static int disk_identify_command(int     fd,
+                                void    *buf,
+                                size_t   buf_len)
+{
+       struct sg_io_v4 io_v4;
+       uint8_t cdb[12];
+       uint8_t sense[32];
+       uint8_t *desc = sense+8;
+       int ret;
+
+       /*
+        * ATA Pass-Through 12 byte command, as described in
+        *
+        *  T10 04-262r8 ATA Command Pass-Through
+        *
+        * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
+        */
+       memset(cdb, 0, sizeof(cdb));
+       cdb[0] = 0xa1;                  /* OPERATION CODE: 12 byte pass through */
+       cdb[1] = 4 << 1;                /* PROTOCOL: PIO Data-in */
+       cdb[2] = 0x2e;                  /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
+       cdb[3] = 0;                     /* FEATURES */
+       cdb[4] = 1;                     /* SECTORS */
+       cdb[5] = 0;                     /* LBA LOW */
+       cdb[6] = 0;                     /* LBA MID */
+       cdb[7] = 0;                     /* LBA HIGH */
+       cdb[8] = 0 & 0x4F;              /* SELECT */
+       cdb[9] = 0xEC;                  /* Command: ATA IDENTIFY DEVICE */;
+       memset(sense, 0, sizeof(sense));
+
+       memset(&io_v4, 0, sizeof(struct sg_io_v4));
+       io_v4.guard = 'Q';
+       io_v4.protocol = BSG_PROTOCOL_SCSI;
+       io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+       io_v4.request_len = sizeof (cdb);
+       io_v4.request = (uintptr_t) cdb;
+       io_v4.max_response_len = sizeof (sense);
+       io_v4.response = (uintptr_t) sense;
+       io_v4.din_xfer_len = buf_len;
+       io_v4.din_xferp = (uintptr_t) buf;
+       io_v4.timeout = COMMAND_TIMEOUT_MSEC;
+
+       ret = ioctl(fd, SG_IO, &io_v4);
+       if (ret != 0) {
+               /* could be that the driver doesn't do version 4, try version 3 */
+               if (errno == EINVAL) {
+                       struct sg_io_hdr io_hdr;
+
+                       memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                       io_hdr.interface_id = 'S';
+                       io_hdr.cmdp = (unsigned char*) cdb;
+                       io_hdr.cmd_len = sizeof (cdb);
+                       io_hdr.dxferp = buf;
+                       io_hdr.dxfer_len = buf_len;
+                       io_hdr.sbp = sense;
+                       io_hdr.mx_sb_len = sizeof (sense);
+                       io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                       io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
+
+                       ret = ioctl(fd, SG_IO, &io_hdr);
+                       if (ret != 0)
+                               goto out;
+               } else {
+                       goto out;
+               }
+       }
+
+       if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
+               errno = EIO;
+               ret = -1;
+               goto out;
+       }
+
+ out:
+       return ret;
+}
+
+static int disk_identify_packet_device_command(int       fd,
+                                              void      *buf,
+                                              size_t     buf_len)
+{
+       struct sg_io_v4 io_v4;
+       uint8_t cdb[16];
+       uint8_t sense[32];
+       uint8_t *desc = sense+8;
+       int ret;
+
+       /*
+        * ATA Pass-Through 16 byte command, as described in
+        *
+        *  T10 04-262r8 ATA Command Pass-Through
+        *
+        * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
+        */
+       memset(cdb, 0, sizeof(cdb));
+       cdb[0] = 0x85;                  /* OPERATION CODE: 16 byte pass through */
+       cdb[1] = 4 << 1;                /* PROTOCOL: PIO Data-in */
+       cdb[2] = 0x2e;                  /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
+       cdb[3] = 0;                     /* FEATURES */
+       cdb[4] = 0;                     /* FEATURES */
+       cdb[5] = 0;                     /* SECTORS */
+       cdb[6] = 1;                     /* SECTORS */
+       cdb[7] = 0;                     /* LBA LOW */
+       cdb[8] = 0;                     /* LBA LOW */
+       cdb[9] = 0;                     /* LBA MID */
+       cdb[10] = 0;                    /* LBA MID */
+       cdb[11] = 0;                    /* LBA HIGH */
+       cdb[12] = 0;                    /* LBA HIGH */
+       cdb[13] = 0;                    /* DEVICE */
+       cdb[14] = 0xA1;                 /* Command: ATA IDENTIFY PACKET DEVICE */;
+       cdb[15] = 0;                    /* CONTROL */
+       memset(sense, 0, sizeof(sense));
+
+       memset(&io_v4, 0, sizeof(struct sg_io_v4));
+       io_v4.guard = 'Q';
+       io_v4.protocol = BSG_PROTOCOL_SCSI;
+       io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+       io_v4.request_len = sizeof (cdb);
+       io_v4.request = (uintptr_t) cdb;
+       io_v4.max_response_len = sizeof (sense);
+       io_v4.response = (uintptr_t) sense;
+       io_v4.din_xfer_len = buf_len;
+       io_v4.din_xferp = (uintptr_t) buf;
+       io_v4.timeout = COMMAND_TIMEOUT_MSEC;
+
+       ret = ioctl(fd, SG_IO, &io_v4);
+       if (ret != 0) {
+               /* could be that the driver doesn't do version 4, try version 3 */
+               if (errno == EINVAL) {
+                       struct sg_io_hdr io_hdr;
+
+                       memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                       io_hdr.interface_id = 'S';
+                       io_hdr.cmdp = (unsigned char*) cdb;
+                       io_hdr.cmd_len = sizeof (cdb);
+                       io_hdr.dxferp = buf;
+                       io_hdr.dxfer_len = buf_len;
+                       io_hdr.sbp = sense;
+                       io_hdr.mx_sb_len = sizeof (sense);
+                       io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                       io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
+
+                       ret = ioctl(fd, SG_IO, &io_hdr);
+                       if (ret != 0)
+                               goto out;
+               } else {
+                       goto out;
+               }
+       }
+
+       if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
+               errno = EIO;
+               ret = -1;
+               goto out;
+       }
+
+ out:
+       return ret;
+}
+
+/**
+ * disk_identify_get_string:
+ * @identify: A block of IDENTIFY data
+ * @offset_words: Offset of the string to get, in words.
+ * @dest: Destination buffer for the string.
+ * @dest_len: Length of destination buffer, in bytes.
+ *
+ * Copies the ATA string from @identify located at @offset_words into @dest.
+ */
+static void disk_identify_get_string (uint8_t identify[512],
+                                     unsigned int offset_words,
+                                     char *dest,
+                                     size_t dest_len)
+{
+       unsigned int c1;
+       unsigned int c2;
+
+       assert (identify != NULL);
+       assert (dest != NULL);
+       assert ((dest_len & 1) == 0);
+
+       while (dest_len > 0) {
+               c1 = ((uint16_t *) identify)[offset_words] >> 8;
+               c2 = ((uint16_t *) identify)[offset_words] & 0xff;
+               *dest = c1;
+               dest++;
+               *dest = c2;
+               dest++;
+               offset_words++;
+               dest_len -= 2;
+       }
+}
+
+static void disk_identify_fixup_string (uint8_t identify[512],
+                                       unsigned int offset_words,
+                                       size_t len)
+{
+       disk_identify_get_string(identify, offset_words,
+                                (char *) identify + offset_words * 2, len);
+}
+
+static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offset_words)
+{
+       uint16_t *p;
+
+       p = (uint16_t *) identify;
+       p[offset_words] = le16toh (p[offset_words]);
 }
-#endif
 
-static void set_str(char *to, const char *from, size_t count)
+/**
+ * disk_identify:
+ * @udev: The libudev context.
+ * @fd: File descriptor for the block device.
+ * @out_identify: Return location for IDENTIFY data.
+ * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE.
+ *
+ * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the
+ * device represented by @fd. If successful, then the result will be
+ * copied into @out_identify and @out_is_packet_device.
+ *
+ * This routine is based on code from libatasmart, Copyright 2008
+ * Lennart Poettering, LGPL v2.1.
+ *
+ * Returns: 0 if the data was successfully obtained, otherwise
+ * non-zero with errno set.
+ */
+static int disk_identify (struct udev *udev,
+                         int          fd,
+                         uint8_t      out_identify[512],
+                         int         *out_is_packet_device)
 {
-       size_t i, j, len;
-
-       /* strip trailing whitespace */
-       len = strnlen(from, count);
-       while (len && isspace(from[len-1]))
-               len--;
-
-       /* strip leading whitespace */
-       i = 0;
-       while (isspace(from[i]) && (i < len))
-               i++;
-
-       j = 0;
-       while (i < len) {
-               /* substitute multiple whitespace */
-               if (isspace(from[i])) {
-                       while (isspace(from[i]))
-                               i++;
-                       to[j++] = '_';
-               }
-               /* skip chars */
-               if (from[i] == '/') {
-                       i++;
-                       continue;
-               }
-               to[j++] = from[i++];
+       int ret;
+       uint8_t inquiry_buf[36];
+       int peripheral_device_type;
+       int all_nul_bytes;
+       int n;
+       int is_packet_device;
+
+       assert (out_identify != NULL);
+
+       /* init results */
+       ret = -1;
+       memset (out_identify, '\0', 512);
+       is_packet_device = 0;
+
+       /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
+        * we could accidentally blank media. This is because MMC's BLANK
+        * command has the same op-code (0x61).
+        *
+        * To prevent this from happening we bail out if the device
+        * isn't a Direct Access Block Device, e.g. SCSI type 0x00
+        * (CD/DVD devices are type 0x05). So we send a SCSI INQUIRY
+        * command first... libata is handling this via its SCSI
+        * emulation layer.
+        *
+        * This also ensures that we're actually dealing with a device
+        * that understands SCSI commands.
+        *
+        * (Yes, it is a bit perverse that we're tunneling the ATA
+        * command through SCSI and relying on the ATA driver
+        * emulating SCSI well-enough...)
+        *
+        * (See commit 160b069c25690bfb0c785994c7c3710289179107 for
+        * the original bug-fix and see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556635
+        * for the original bug-report.)
+        */
+       ret = disk_scsi_inquiry_command (fd, inquiry_buf, sizeof (inquiry_buf));
+       if (ret != 0)
+               goto out;
+
+       /* SPC-4, section 6.4.2: Standard INQUIRY data */
+       peripheral_device_type = inquiry_buf[0] & 0x1f;
+       if (peripheral_device_type == 0x05)
+         {
+           is_packet_device = 1;
+           ret = disk_identify_packet_device_command(fd, out_identify, 512);
+           goto check_nul_bytes;
+         }
+       if (peripheral_device_type != 0x00) {
+               ret = -1;
+               errno = EIO;
+               goto out;
+       }
+
+       /* OK, now issue the IDENTIFY DEVICE command */
+       ret = disk_identify_command(fd, out_identify, 512);
+       if (ret != 0)
+               goto out;
+
+ check_nul_bytes:
+        /* Check if IDENTIFY data is all NUL bytes - if so, bail */
+       all_nul_bytes = 1;
+       for (n = 0; n < 512; n++) {
+               if (out_identify[n] != '\0') {
+                       all_nul_bytes = 0;
+                       break;
+               }
+       }
+
+       if (all_nul_bytes) {
+               ret = -1;
+               errno = EIO;
+               goto out;
        }
-       to[j] = '\0';
+
+out:
+       if (out_is_packet_device != NULL)
+         *out_is_packet_device = is_packet_device;
+       return ret;
+}
+
+static void log_fn(struct udev *udev, int priority,
+                  const char *file, int line, const char *fn,
+                  const char *format, va_list args)
+{
+       vsyslog(priority, format, args);
 }
 
 int main(int argc, char *argv[])
 {
+       struct udev *udev;
        struct hd_driveid id;
+       uint8_t identify[512];
+       uint16_t *identify_words;
        char model[41];
+       char model_enc[256];
        char serial[21];
        char revision[9];
        const char *node = NULL;
-       int i;
        int export = 0;
        int fd;
+       uint16_t word;
        int rc = 0;
+       int is_packet_device = 0;
+       static const struct option options[] = {
+               { "export", no_argument, NULL, 'x' },
+               { "help", no_argument, NULL, 'h' },
+               {}
+       };
+
+       udev = udev_new();
+       if (udev == NULL)
+               goto exit;
 
-       logging_init("ata_id");
+       udev_log_init("ata_id");
+       udev_set_log_fn(udev, log_fn);
 
-       for (i = 1 ; i < argc; i++) {
-               char *arg = argv[i];
+       while (1) {
+               int option;
 
-               if (strcmp(arg, "--export") == 0) {
+               option = getopt_long(argc, argv, "xh", options, NULL);
+               if (option == -1)
+                       break;
+
+               switch (option) {
+               case 'x':
                        export = 1;
-               } else
-                       node = arg;
+                       break;
+               case 'h':
+                       printf("Usage: ata_id [--export] [--help] <device>\n"
+                              "  --export    print values as environment keys\n"
+                              "  --help      print this help text\n\n");
+                       goto exit;
+               }
        }
-       if (!node) {
-               err("no node specified");
+
+       node = argv[optind];
+       if (node == NULL) {
+               err(udev, "no node specified\n");
                rc = 1;
                goto exit;
        }
 
-       fd = open(node, O_RDONLY);
-       if (fd < 0)
-               if (errno == ENOMEDIUM)
-                       fd = open(node, O_RDONLY|O_NONBLOCK);
+       fd = open(node, O_RDONLY|O_NONBLOCK);
        if (fd < 0) {
-               err("unable to open '%s'", node);
+               err(udev, "unable to open '%s'\n", node);
                rc = 1;
                goto exit;
        }
 
-       if (ioctl(fd, HDIO_GET_IDENTITY, &id)) {
-               err("HDIO_GET_IDENTITY failed for '%s'", node);
-               rc = 3;
-               goto close;
+       if (disk_identify(udev, fd, identify, &is_packet_device) == 0) {
+               /*
+                * fix up only the fields from the IDENTIFY data that we are going to
+                * use and copy it into the hd_driveid struct for convenience
+                */
+               disk_identify_fixup_string (identify,  10, 20); /* serial */
+               disk_identify_fixup_string (identify,  23,  6); /* fwrev */
+               disk_identify_fixup_string (identify,  27, 40); /* model */
+               disk_identify_fixup_uint16 (identify,   0);     /* configuration */
+               disk_identify_fixup_uint16 (identify,  75);     /* queue depth */
+               disk_identify_fixup_uint16 (identify,  75);     /* SATA capabilities */
+               disk_identify_fixup_uint16 (identify,  82);     /* command set supported */
+               disk_identify_fixup_uint16 (identify,  83);     /* command set supported */
+               disk_identify_fixup_uint16 (identify,  84);     /* command set supported */
+               disk_identify_fixup_uint16 (identify,  85);     /* command set supported */
+               disk_identify_fixup_uint16 (identify,  86);     /* command set supported */
+               disk_identify_fixup_uint16 (identify,  87);     /* command set supported */
+               disk_identify_fixup_uint16 (identify,  89);     /* time required for SECURITY ERASE UNIT */
+               disk_identify_fixup_uint16 (identify,  90);     /* time required for enhanced SECURITY ERASE UNIT */
+               disk_identify_fixup_uint16 (identify,  91);     /* current APM values */
+               disk_identify_fixup_uint16 (identify,  94);     /* current AAM value */
+               disk_identify_fixup_uint16 (identify, 128);     /* device lock function */
+               disk_identify_fixup_uint16 (identify, 217);     /* nominal media rotation rate */
+               memcpy(&id, identify, sizeof id);
+       } else {
+               /* If this fails, then try HDIO_GET_IDENTITY */
+               if (ioctl(fd, HDIO_GET_IDENTITY, &id) != 0) {
+                       if (errno == ENOTTY) {
+                               info(udev, "HDIO_GET_IDENTITY unsupported for '%s'\n", node);
+                               rc = 2;
+                       } else {
+                               err(udev, "HDIO_GET_IDENTITY failed for '%s': %m\n", node);
+                               rc = 3;
+                       }
+                       goto close;
+               }
        }
+       identify_words = (uint16_t *) identify;
 
-       set_str(model, (char *) id.model, 40);
-       set_str(serial, (char *) id.serial_no, 20);
-       set_str(revision, (char *) id.fw_rev, 8);
+       memcpy (model, id.model, 40);
+       model[40] = '\0';
+       udev_util_encode_string(model, model_enc, sizeof(model_enc));
+       util_replace_whitespace((char *) id.model, model, 40);
+       util_replace_chars(model, NULL);
+       util_replace_whitespace((char *) id.serial_no, serial, 20);
+       util_replace_chars(serial, NULL);
+       util_replace_whitespace((char *) id.fw_rev, revision, 8);
+       util_replace_chars(revision, NULL);
 
        if (export) {
+               /* Set this to convey the disk speaks the ATA protocol */
+               printf("ID_ATA=1\n");
+
                if ((id.config >> 8) & 0x80) {
                        /* This is an ATAPI device */
                        switch ((id.config >> 8) & 0x1f) {
@@ -165,20 +580,147 @@ int main(int argc, char *argv[])
                } else {
                        printf("ID_TYPE=disk\n");
                }
+               printf("ID_BUS=ata\n");
                printf("ID_MODEL=%s\n", model);
-               printf("ID_SERIAL=%s\n", serial);
+               printf("ID_MODEL_ENC=%s\n", model_enc);
                printf("ID_REVISION=%s\n", revision);
-               printf("ID_BUS=ata\n");
+               if (serial[0] != '\0') {
+                       printf("ID_SERIAL=%s_%s\n", model, serial);
+                       printf("ID_SERIAL_SHORT=%s\n", serial);
+               } else {
+                       printf("ID_SERIAL=%s\n", model);
+               }
+
+               if (id.command_set_1 & (1<<5)) {
+                       printf ("ID_ATA_WRITE_CACHE=1\n");
+                       printf ("ID_ATA_WRITE_CACHE_ENABLED=%d\n", (id.cfs_enable_1 & (1<<5)) ? 1 : 0);
+               }
+               if (id.command_set_1 & (1<<10)) {
+                       printf("ID_ATA_FEATURE_SET_HPA=1\n");
+                       printf("ID_ATA_FEATURE_SET_HPA_ENABLED=%d\n", (id.cfs_enable_1 & (1<<10)) ? 1 : 0);
+
+                       /*
+                        * TODO: use the READ NATIVE MAX ADDRESS command to get the native max address
+                        * so it is easy to check whether the protected area is in use.
+                        */
+               }
+               if (id.command_set_1 & (1<<3)) {
+                       printf("ID_ATA_FEATURE_SET_PM=1\n");
+                       printf("ID_ATA_FEATURE_SET_PM_ENABLED=%d\n", (id.cfs_enable_1 & (1<<3)) ? 1 : 0);
+               }
+               if (id.command_set_1 & (1<<1)) {
+                       printf("ID_ATA_FEATURE_SET_SECURITY=1\n");
+                       printf("ID_ATA_FEATURE_SET_SECURITY_ENABLED=%d\n", (id.cfs_enable_1 & (1<<1)) ? 1 : 0);
+                       printf("ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN=%d\n", id.trseuc * 2);
+                       if ((id.cfs_enable_1 & (1<<1))) /* enabled */ {
+                               if (id.dlf & (1<<8))
+                                       printf("ID_ATA_FEATURE_SET_SECURITY_LEVEL=maximum\n");
+                               else
+                                       printf("ID_ATA_FEATURE_SET_SECURITY_LEVEL=high\n");
+                       }
+                       if (id.dlf & (1<<5))
+                               printf("ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN=%d\n", id.trsEuc * 2);
+                       if (id.dlf & (1<<4))
+                               printf("ID_ATA_FEATURE_SET_SECURITY_EXPIRE=1\n");
+                       if (id.dlf & (1<<3))
+                               printf("ID_ATA_FEATURE_SET_SECURITY_FROZEN=1\n");
+                       if (id.dlf & (1<<2))
+                               printf("ID_ATA_FEATURE_SET_SECURITY_LOCKED=1\n");
+               }
+               if (id.command_set_1 & (1<<0)) {
+                       printf("ID_ATA_FEATURE_SET_SMART=1\n");
+                       printf("ID_ATA_FEATURE_SET_SMART_ENABLED=%d\n", (id.cfs_enable_1 & (1<<0)) ? 1 : 0);
+               }
+               if (id.command_set_2 & (1<<9)) {
+                       printf("ID_ATA_FEATURE_SET_AAM=1\n");
+                       printf("ID_ATA_FEATURE_SET_AAM_ENABLED=%d\n", (id.cfs_enable_2 & (1<<9)) ? 1 : 0);
+                       printf("ID_ATA_FEATURE_SET_AAM_VENDOR_RECOMMENDED_VALUE=%d\n", id.acoustic >> 8);
+                       printf("ID_ATA_FEATURE_SET_AAM_CURRENT_VALUE=%d\n", id.acoustic & 0xff);
+               }
+               if (id.command_set_2 & (1<<5)) {
+                       printf("ID_ATA_FEATURE_SET_PUIS=1\n");
+                       printf("ID_ATA_FEATURE_SET_PUIS_ENABLED=%d\n", (id.cfs_enable_2 & (1<<5)) ? 1 : 0);
+               }
+               if (id.command_set_2 & (1<<3)) {
+                       printf("ID_ATA_FEATURE_SET_APM=1\n");
+                       printf("ID_ATA_FEATURE_SET_APM_ENABLED=%d\n", (id.cfs_enable_2 & (1<<3)) ? 1 : 0);
+                       if ((id.cfs_enable_2 & (1<<3)))
+                               printf("ID_ATA_FEATURE_SET_APM_CURRENT_VALUE=%d\n", id.CurAPMvalues & 0xff);
+               }
+               if (id.command_set_2 & (1<<0))
+                       printf("ID_ATA_DOWNLOAD_MICROCODE=1\n");
+
+               /*
+                * Word 76 indicates the capabilities of a SATA device. A PATA device shall set
+                * word 76 to 0000h or FFFFh. If word 76 is set to 0000h or FFFFh, then
+                * the device does not claim compliance with the Serial ATA specification and words
+                * 76 through 79 are not valid and shall be ignored.
+                */
+               word = *((uint16_t *) identify + 76);
+               if (word != 0x0000 && word != 0xffff) {
+                       printf("ID_ATA_SATA=1\n");
+                       /*
+                        * If bit 2 of word 76 is set to one, then the device supports the Gen2
+                        * signaling rate of 3.0 Gb/s (see SATA 2.6).
+                        *
+                        * If bit 1 of word 76 is set to one, then the device supports the Gen1
+                        * signaling rate of 1.5 Gb/s (see SATA 2.6).
+                        */
+                       if (word & (1<<2))
+                               printf("ID_ATA_SATA_SIGNAL_RATE_GEN2=1\n");
+                       if (word & (1<<1))
+                               printf("ID_ATA_SATA_SIGNAL_RATE_GEN1=1\n");
+               }
+
+               /* Word 217 indicates the nominal media rotation rate of the device */
+               word = *((uint16_t *) identify + 217);
+               if (word != 0x0000) {
+                       if (word == 0x0001) {
+                               printf ("ID_ATA_ROTATION_RATE_RPM=0\n"); /* non-rotating e.g. SSD */
+                       } else if (word >= 0x0401 && word <= 0xfffe) {
+                               printf ("ID_ATA_ROTATION_RATE_RPM=%d\n", word);
+                       }
+               }
+
+               /*
+                * Words 108-111 contain a mandatory World Wide Name (WWN) in the NAA IEEE Registered identifier
+                * format. Word 108 bits (15:12) shall contain 5h, indicating that the naming authority is IEEE.
+                * All other values are reserved.
+                */
+               word = *((uint16_t *) identify + 108);
+               if ((word & 0xf000) == 0x5000) {
+                       uint64_t wwwn;
+
+                       wwwn   = *((uint16_t *) identify + 108);
+                       wwwn <<= 16;
+                       wwwn  |= *((uint16_t *) identify + 109);
+                       wwwn <<= 16;
+                       wwwn  |= *((uint16_t *) identify + 110);
+                       wwwn <<= 16;
+                       wwwn  |= *((uint16_t *) identify + 111);
+                       printf("ID_WWN=0x%llx\n", (unsigned long long int) wwwn);
+                       /* ATA devices have no vendor extension */
+                       printf("ID_WWN_WITH_EXTENSION=0x%llx\n", (unsigned long long int) wwwn);
+               }
+
+               /* from Linux's include/linux/ata.h */
+               if (identify_words[0] == 0x848a || identify_words[0] == 0x844a) {
+                       printf("ID_ATA_CFA=1\n");
+               } else {
+                       if ((identify_words[83] & 0xc004) == 0x4004) {
+                               printf("ID_ATA_CFA=1\n");
+                       }
+               }
        } else {
                if (serial[0] != '\0')
                        printf("%s_%s\n", model, serial);
                else
                        printf("%s\n", model);
        }
-
 close:
        close(fd);
 exit:
-       logging_close();
+       udev_unref(udev);
+       udev_log_close();
        return rc;
 }